Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (34 commits)
  trivial: fix typo in aic7xxx comment
  trivial: fix comment typo in drivers/ata/pata_hpt37x.c
  trivial: typo in kernel-parameters.txt
  trivial: fix typo in tracing documentation
  trivial: add __init/__exit macros in drivers/gpio/bt8xxgpio.c
  trivial: add __init macro/ fix of __exit macro location in ipmi_poweroff.c
  trivial: remove unnecessary semicolons
  trivial: Fix duplicated word "options" in comment
  trivial: kbuild: remove extraneous blank line after declaration of usage()
  trivial: improve help text for mm debug config options
  trivial: doc: hpfall: accept disk device to unload as argument
  trivial: doc: hpfall: reduce risk that hpfall can do harm
  trivial: SubmittingPatches: Fix reference to renumbered step
  trivial: fix typos "man[ae]g?ment" -> "management"
  trivial: media/video/cx88: add __init/__exit macros to cx88 drivers
  trivial: fix typo in CONFIG_DEBUG_FS in gcov doc
  trivial: fix missing printk space in amd_k7_smp_check
  trivial: fix typo s/ketymap/keymap/ in comment
  trivial: fix typo "to to" in multiple files
  trivial: fix typos in comments s/DGBU/DBGU/
  ...

diff --combined MAINTAINERS
index da7a811,64d4177..d24c882
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -233,7 -233,6 +233,7 @@@ S: Supporte
  F:    drivers/acpi/
  F:    drivers/pnp/pnpacpi/
  F:    include/linux/acpi.h
 +F:    include/acpi/
  
  ACPI BATTERY DRIVERS
  M:    Alexey Starikovskiy <astarikovskiy@suse.de>
@@@ -498,7 -497,7 +498,7 @@@ F: arch/arm/include/asm/floppy.
  
  ARM PORT
  M:    Russell King <linux@arm.linux.org.uk>
 -L:    linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  W:    http://www.arm.linux.org.uk/
  S:    Maintained
  F:    arch/arm/
@@@ -509,36 -508,36 +509,36 @@@ F:      drivers/mmc/host/mmci.
  
  ARM/ADI ROADRUNNER MACHINE SUPPORT
  M:    Lennert Buytenhek <kernel@wantstofly.org>
 -L:    linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  F:    arch/arm/mach-ixp23xx/
  F:    arch/arm/mach-ixp23xx/include/mach/
  
  ARM/ADS SPHERE MACHINE SUPPORT
  M:    Lennert Buytenhek <kernel@wantstofly.org>
 -L:    linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  
  ARM/AFEB9260 MACHINE SUPPORT
  M:    Sergey Lapin <slapin@ossfans.org>
 -L:    linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  
  ARM/AJECO 1ARM MACHINE SUPPORT
  M:    Lennert Buytenhek <kernel@wantstofly.org>
 -L:    linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  
  ARM/ATMEL AT91RM9200 ARM ARCHITECTURE
  M:    Andrew Victor <linux@maxim.org.za>
 -L:    linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  W:    http://maxim.org.za/at91_26.html
  S:    Maintained
  
  ARM/BCMRING ARM ARCHITECTURE
  M:    Leo Chen <leochen@broadcom.com>
  M:    Scott Branden <sbranden@broadcom.com>
 -L:    linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  F:    arch/arm/mach-bcmring
  
@@@ -555,25 -554,25 +555,25 @@@ F:      drivers/mtd/nand/nand_bcm_umi.
  ARM/CIRRUS LOGIC EP93XX ARM ARCHITECTURE
  M:    Hartley Sweeten <hsweeten@visionengravers.com>
  M:    Ryan Mallon <ryan@bluewatersys.com>
 -L:    linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  F:    arch/arm/mach-ep93xx/
  F:    arch/arm/mach-ep93xx/include/mach/
  
  ARM/CIRRUS LOGIC EDB9315A MACHINE SUPPORT
  M:    Lennert Buytenhek <kernel@wantstofly.org>
 -L:    linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  
  ARM/CLKDEV SUPPORT
  M:    Russell King <linux@arm.linux.org.uk>
 -L:    linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  F:    arch/arm/common/clkdev.c
  F:    arch/arm/include/asm/clkdev.h
  
  ARM/COMPULAB CM-X270/EM-X270 and CM-X300 MACHINE SUPPORT
  M:    Mike Rapoport <mike@compulab.co.il>
 -L:    linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  
  ARM/CORGI MACHINE SUPPORT
@@@ -582,14 -581,14 +582,14 @@@ S:      Maintaine
  
  ARM/CORTINA SYSTEMS GEMINI ARM ARCHITECTURE
  M:    Paulius Zaleckas <paulius.zaleckas@teltonika.lt>
 -L:    linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  T:    git git://gitorious.org/linux-gemini/mainline.git
  S:    Maintained
  F:    arch/arm/mach-gemini/
  
  ARM/EBSA110 MACHINE SUPPORT
  M:    Russell King <linux@arm.linux.org.uk>
 -L:    linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  W:    http://www.arm.linux.org.uk/
  S:    Maintained
  F:    arch/arm/mach-ebsa110/
@@@ -607,13 -606,13 +607,13 @@@ F:      arch/arm/mach-pxa/ezx.
  
  ARM/FARADAY FA526 PORT
  M:    Paulius Zaleckas <paulius.zaleckas@teltonika.lt>
 -L:    linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  F:    arch/arm/mm/*-fa*
  
  ARM/FOOTBRIDGE ARCHITECTURE
  M:    Russell King <linux@arm.linux.org.uk>
 -L:    linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  W:    http://www.arm.linux.org.uk/
  S:    Maintained
  F:    arch/arm/include/asm/hardware/dec21285.h
@@@ -621,17 -620,17 +621,17 @@@ F:      arch/arm/mach-footbridge
  
  ARM/FREESCALE IMX / MXC ARM ARCHITECTURE
  M:    Sascha Hauer <kernel@pengutronix.de>
 -L:    linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  
  ARM/GLOMATION GESBC9312SX MACHINE SUPPORT
  M:    Lennert Buytenhek <kernel@wantstofly.org>
 -L:    linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  
  ARM/GUMSTIX MACHINE SUPPORT
  M:    Steve Sakoman <sakoman@gmail.com>
 -L:    linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  
  ARM/H4700 (HP IPAQ HX4700) MACHINE SUPPORT
@@@ -651,55 -650,55 +651,55 @@@ F:      arch/arm/mach-sa1100/include/mach/jo
  ARM/INTEL IOP32X ARM ARCHITECTURE
  M:    Lennert Buytenhek <kernel@wantstofly.org>
  M:    Dan Williams <dan.j.williams@intel.com>
 -L:    linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Supported
  
  ARM/INTEL IOP33X ARM ARCHITECTURE
  M:    Dan Williams <dan.j.williams@intel.com>
 -L:    linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Supported
  
  ARM/INTEL IOP13XX ARM ARCHITECTURE
  M:    Lennert Buytenhek <kernel@wantstofly.org>
  M:    Dan Williams <dan.j.williams@intel.com>
 -L:    linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Supported
  
  ARM/INTEL IQ81342EX MACHINE SUPPORT
  M:    Lennert Buytenhek <kernel@wantstofly.org>
  M:    Dan Williams <dan.j.williams@intel.com>
 -L:    linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Supported
  
  ARM/INTEL IXP2000 ARM ARCHITECTURE
  M:    Lennert Buytenhek <kernel@wantstofly.org>
 -L:    linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  
  ARM/INTEL IXDP2850 MACHINE SUPPORT
  M:    Lennert Buytenhek <kernel@wantstofly.org>
 -L:    linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  
  ARM/INTEL IXP23XX ARM ARCHITECTURE
  M:    Lennert Buytenhek <kernel@wantstofly.org>
 -L:    linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  
  ARM/INTEL XSC3 (MANZANO) ARM CORE
  M:    Lennert Buytenhek <kernel@wantstofly.org>
  M:    Dan Williams <dan.j.williams@intel.com>
 -L:    linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Supported
  
  ARM/IP FABRICS DOUBLE ESPRESSO MACHINE SUPPORT
  M:    Lennert Buytenhek <kernel@wantstofly.org>
 -L:    linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  
  ARM/LOGICPD PXA270 MACHINE SUPPORT
  M:    Lennert Buytenhek <kernel@wantstofly.org>
 -L:    linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  
  ARM/MAGICIAN MACHINE SUPPORT
@@@ -709,7 -708,7 +709,7 @@@ S: Maintaine
  ARM/Marvell Loki/Kirkwood/MV78xx0/Orion SOC support
  M:    Lennert Buytenhek <buytenh@marvell.com>
  M:    Nicolas Pitre <nico@marvell.com>
 -L:    linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  T:    git git://git.marvell.com/orion
  S:    Maintained
  F:    arch/arm/mach-loki/
@@@ -720,7 -719,7 +720,7 @@@ F: arch/arm/plat-orion
  
  ARM/MIOA701 MACHINE SUPPORT
  M:    Robert Jarzmik <robert.jarzmik@free.fr>
 -L:    linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  F:    arch/arm/mach-pxa/mioa701.c
  S:    Maintained
  
@@@ -761,18 -760,18 +761,18 @@@ S:      Maintaine
  
  ARM/PT DIGITAL BOARD PORT
  M:    Stefan Eletzhofer <stefan.eletzhofer@eletztrick.de>
 -L:    linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  W:    http://www.arm.linux.org.uk/
  S:    Maintained
  
  ARM/RADISYS ENP2611 MACHINE SUPPORT
  M:    Lennert Buytenhek <kernel@wantstofly.org>
 -L:    linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  
  ARM/RISCPC ARCHITECTURE
  M:    Russell King <linux@arm.linux.org.uk>
 -L:    linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  W:    http://www.arm.linux.org.uk/
  S:    Maintained
  F:    arch/arm/common/time-acorn.c
@@@ -791,7 -790,7 +791,7 @@@ S: Maintaine
  
  ARM/SAMSUNG ARM ARCHITECTURES
  M:    Ben Dooks <ben-linux@fluff.org>
 -L:    linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  W:    http://www.fluff.org/ben/linux/
  S:    Maintained
  F:    arch/arm/plat-s3c/
@@@ -799,65 -798,65 +799,65 @@@ F:      arch/arm/plat-s3c24xx
  
  ARM/S3C2410 ARM ARCHITECTURE
  M:    Ben Dooks <ben-linux@fluff.org>
 -L:    linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  W:    http://www.fluff.org/ben/linux/
  S:    Maintained
  F:    arch/arm/mach-s3c2410/
  
  ARM/S3C2440 ARM ARCHITECTURE
  M:    Ben Dooks <ben-linux@fluff.org>
 -L:    linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  W:    http://www.fluff.org/ben/linux/
  S:    Maintained
  F:    arch/arm/mach-s3c2440/
  
  ARM/S3C2442 ARM ARCHITECTURE
  M:    Ben Dooks <ben-linux@fluff.org>
 -L:    linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  W:    http://www.fluff.org/ben/linux/
  S:    Maintained
  F:    arch/arm/mach-s3c2442/
  
  ARM/S3C2443 ARM ARCHITECTURE
  M:    Ben Dooks <ben-linux@fluff.org>
 -L:    linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  W:    http://www.fluff.org/ben/linux/
  S:    Maintained
  F:    arch/arm/mach-s3c2443/
  
  ARM/S3C6400 ARM ARCHITECTURE
  M:    Ben Dooks <ben-linux@fluff.org>
 -L:    linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  W:    http://www.fluff.org/ben/linux/
  S:    Maintained
  F:    arch/arm/mach-s3c6400/
  
  ARM/S3C6410 ARM ARCHITECTURE
  M:    Ben Dooks <ben-linux@fluff.org>
 -L:    linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  W:    http://www.fluff.org/ben/linux/
  S:    Maintained
  F:    arch/arm/mach-s3c6410/
  
  ARM/TECHNOLOGIC SYSTEMS TS7250 MACHINE SUPPORT
  M:    Lennert Buytenhek <kernel@wantstofly.org>
 -L:    linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  
  ARM/THECUS N2100 MACHINE SUPPORT
  M:    Lennert Buytenhek <kernel@wantstofly.org>
 -L:    linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  
  ARM/NUVOTON W90X900 ARM ARCHITECTURE
  M:    Wan ZongShun <mcuos.com@gmail.com>
 -L:    linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  W:    http://www.mcuos.com
  S:    Maintained
  
  ARM/VFP SUPPORT
  M:    Russell King <linux@arm.linux.org.uk>
 -L:    linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  W:    http://www.arm.linux.org.uk/
  S:    Maintained
  F:    arch/arm/vfp/
@@@ -964,7 -963,7 +964,7 @@@ F: include/linux/atm
  
  ATMEL AT91 MCI DRIVER
  M:    Nicolas Ferre <nicolas.ferre@atmel.com>
 -L:    linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  W:    http://www.atmel.com/products/AT91/
  W:    http://www.at91.com/
  S:    Maintained
@@@ -1542,7 -1541,7 +1542,7 @@@ F:      drivers/infiniband/hw/cxgb3
  
  CYBERPRO FB DRIVER
  M:    Russell King <linux@arm.linux.org.uk>
 -L:    linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  W:    http://www.arm.linux.org.uk/
  S:    Maintained
  F:    drivers/video/cyber2000fb.*
@@@ -2086,7 -2085,7 +2086,7 @@@ F:      drivers/i2c/busses/i2c-cpm.
  FREESCALE IMX / MXC FRAMEBUFFER DRIVER
  M:    Sascha Hauer <kernel@pengutronix.de>
  L:    linux-fbdev-devel@lists.sourceforge.net (moderated for non-subscribers)
 -L:    linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  F:    arch/arm/plat-mxc/include/mach/imxfb.h
  F:    drivers/video/imxfb.c
@@@ -2804,8 -2803,6 +2804,8 @@@ L:      netdev@vger.kernel.or
  L:    lvs-devel@vger.kernel.org
  S:    Maintained
  F:    Documentation/networking/ipvs-sysctl.txt
 +F:    include/net/ip_vs.h
 +F:    include/linux/ip_vs.h
  F:    net/netfilter/ipvs/
  
  IPWIRELESS DRIVER
@@@ -2958,7 -2955,7 +2958,7 @@@ F:      scripts/Makefile.
  KERNEL JANITORS
  L:    kernel-janitors@vger.kernel.org
  W:    http://www.kerneljanitors.org/
- S:    Odd fixes
+ S:    Maintained
  
  KERNEL NFSD, SUNRPC, AND LOCKD SERVERS
  M:    "J. Bruce Fields" <bfields@fieldses.org>
@@@ -3452,7 -3449,7 +3452,7 @@@ F:      include/linux/meye.
  
  MOTOROLA IMX MMC/SD HOST CONTROLLER INTERFACE DRIVER
  M:    Pavel Pisa <ppisa@pikron.com>
 -L:    linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  F:    drivers/mmc/host/imxmmc.*
  
@@@ -3737,7 -3734,7 +3737,7 @@@ W:      http://www.muru.com/linux/omap
  W:    http://linux.omap.com/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git
  S:    Maintained
 -F:    arch/arm/*omap*
 +F:    arch/arm/*omap*/
  
  OMAP CLOCK FRAMEWORK SUPPORT
  M:    Paul Walmsley <paul@pwsan.com>
@@@ -4003,7 -4000,7 +4003,7 @@@ S:      Maintaine
  F:    include/linux/delayacct.h
  F:    kernel/delayacct.c
  
 -PERFORMANCE COUNTER SUBSYSTEM
 +PERFORMANCE EVENTS SUBSYSTEM
  M:    Peter Zijlstra <a.p.zijlstra@chello.nl>
  M:    Paul Mackerras <paulus@samba.org>
  M:    Ingo Molnar <mingo@elte.hu>
@@@ -4028,7 -4025,8 +4028,7 @@@ F:      drivers/block/pktcdvd.
  F:    include/linux/pktcdvd.h
  
  PMC SIERRA MaxRAID DRIVER
 -P:    Anil Ravindranath
 -M:    anil_ravindranath@pmc-sierra.com
 +M:    Anil Ravindranath <anil_ravindranath@pmc-sierra.com>
  L:    linux-scsi@vger.kernel.org
  W:    http://www.pmc-sierra.com/
  S:    Supported
@@@ -4170,7 -4168,7 +4170,7 @@@ F:      drivers/media/video/pvrusb2
  PXA2xx/PXA3xx SUPPORT
  M:    Eric Miao <eric.y.miao@gmail.com>
  M:    Russell King <linux@arm.linux.org.uk>
 -L:    linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  F:    arch/arm/mach-pxa/
  F:    drivers/pcmcia/pxa2xx*
@@@ -4183,13 -4181,13 +4183,13 @@@ F:   sound/soc/px
  PXA168 SUPPORT
  M:    Eric Miao <eric.y.miao@gmail.com>
  M:    Jason Chagas <jason.chagas@marvell.com>
 -L:    linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6.git
  S:    Maintained
  
  PXA910 SUPPORT
  M:    Eric Miao <eric.y.miao@gmail.com>
 -L:    linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6.git
  S:    Maintained
  
@@@ -4430,7 -4428,7 +4430,7 @@@ F:      net/iucv
  
  S3C24XX SD/MMC Driver
  M:    Ben Dooks <ben-linux@fluff.org>
 -L:    linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Supported
  F:    drivers/mmc/host/s3cmci.*
  
@@@ -4535,20 -4533,20 +4535,20 @@@ S:   Maintaine
  F:    drivers/mmc/host/sdricoh_cs.c
  
  SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) DRIVER
 -M:    Pierre Ossman <pierre@ossman.eu>
 -L:    sdhci-devel@lists.ossman.eu
 -S:    Maintained
 +S:     Orphan
 +L:     linux-mmc@vger.kernel.org
 +F:     drivers/mmc/host/sdhci.*
  
  SECURE DIGITAL HOST CONTROLLER INTERFACE, OPEN FIRMWARE BINDINGS (SDHCI-OF)
  M:    Anton Vorontsov <avorontsov@ru.mvista.com>
  L:    linuxppc-dev@ozlabs.org
 -L:    sdhci-devel@lists.ossman.eu
 +L:     linux-mmc@vger.kernel.org
  S:    Maintained
 -F:    drivers/mmc/host/sdhci.*
 +F:     drivers/mmc/host/sdhci-of.*
  
  SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) SAMSUNG DRIVER
  M:    Ben Dooks <ben-linux@fluff.org>
 -L:    sdhci-devel@lists.ossman.eu
 +L:     linux-mmc@vger.kernel.org
  S:    Maintained
  F:    drivers/mmc/host/sdhci-s3c.c
  
@@@ -4634,7 -4632,7 +4634,7 @@@ F:      drivers/misc/sgi-xp
  SHARP LH SUPPORT (LH7952X & LH7A40X)
  M:    Marc Singer <elf@buici.com>
  W:    http://projects.buici.com/arm
 -L:    linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  F:    Documentation/arm/Sharp-LH/ADC-LH7-Touchscreen
  F:    arch/arm/mach-lh7a40x/
@@@ -5640,12 -5638,6 +5640,12 @@@ L:    linux-scsi@vger.kernel.or
  S:    Maintained
  F:    drivers/scsi/wd7000.c
  
 +WINBOND CIR DRIVER
 +P:    David Härdeman
 +M:    david@hardeman.nu
 +S:    Maintained
 +F:    drivers/input/misc/winbond-cir.c
 +
  WIMAX STACK
  M:    Inaky Perez-Gonzalez <inaky.perez-gonzalez@intel.com>
  M:    linux-wimax@intel.com
@@@ -5665,7 -5657,8 +5665,7 @@@ S:      Maintaine
  F:    drivers/input/misc/wistron_btns.c
  
  WL1251 WIRELESS DRIVER
 -P:    Kalle Valo
 -M:    kalle.valo@nokia.com
 +M:    Kalle Valo <kalle.valo@nokia.com>
  L:    linux-wireless@vger.kernel.org
  W:    http://wireless.kernel.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git

diff --combined arch/s390/hypfs/inode.c
index dc2d666,1baa635..341aff2
--- 1/arch/s390/hypfs/inode.c
--- 2/arch/s390/hypfs/inode.c
+++ b/arch/s390/hypfs/inode.c
@@@ -41,7 -41,7 +41,7 @@@ struct hypfs_sb_info 
  
  static const struct file_operations hypfs_file_ops;
  static struct file_system_type hypfs_type;
 -static struct super_operations hypfs_s_ops;
 +static const struct super_operations hypfs_s_ops;
  
  /* start of list of all dentries, which have to be deleted on update */
  static struct dentry *hypfs_last_dentry;
@@@ -472,7 -472,7 +472,7 @@@ static struct file_system_type hypfs_ty
        .kill_sb        = hypfs_kill_super
  };
  
 -static struct super_operations hypfs_s_ops = {
 +static const struct super_operations hypfs_s_ops = {
        .statfs         = simple_statfs,
        .drop_inode     = hypfs_drop_inode,
        .show_options   = hypfs_show_options,
@@@ -496,7 -496,7 +496,7 @@@ static int __init hypfs_init(void
        }
        s390_kobj = kobject_create_and_add("s390", hypervisor_kobj);
        if (!s390_kobj) {
-               rc = -ENOMEM;;
+               rc = -ENOMEM;
                goto fail_sysfs;
        }
        rc = register_filesystem(&hypfs_type);

diff --combined drivers/block/DAC960.c
index 8b50af3,26caa3f..c77b6f3
--- 1/drivers/block/DAC960.c
--- 2/drivers/block/DAC960.c
+++ b/drivers/block/DAC960.c
@@@ -152,7 -152,7 +152,7 @@@ static int DAC960_revalidate_disk(struc
        return 0;
  }
  
 -static struct block_device_operations DAC960_BlockDeviceOperations = {
 +static const struct block_device_operations DAC960_BlockDeviceOperations = {
        .owner                  = THIS_MODULE,
        .open                   = DAC960_open,
        .getgeo                 = DAC960_getgeo,
@@@ -6653,7 -6653,7 +6653,7 @@@ static long DAC960_gam_ioctl(struct fil
        else ErrorCode = get_user(ControllerNumber,
                             &UserSpaceControllerInfo->ControllerNumber);
        if (ErrorCode != 0)
-               break;;
+               break;
        ErrorCode = -ENXIO;
        if (ControllerNumber < 0 ||
            ControllerNumber > DAC960_ControllerCount - 1) {
@@@ -6661,7 -6661,7 +6661,7 @@@
        }
        Controller = DAC960_Controllers[ControllerNumber];
        if (Controller == NULL)
-               break;;
+               break;
        memset(&ControllerInfo, 0, sizeof(DAC960_ControllerInfo_T));
        ControllerInfo.ControllerNumber = ControllerNumber;
        ControllerInfo.FirmwareType = Controller->FirmwareType;
@@@ -7210,7 -7210,7 +7210,7 @@@ static struct pci_driver DAC960_pci_dri
        .remove         = DAC960_Remove,
  };
  
- static int DAC960_init_module(void)
+ static int __init DAC960_init_module(void)
  {
        int ret;
  
@@@ -7222,7 -7222,7 +7222,7 @@@
        return ret;
  }
  
- static void DAC960_cleanup_module(void)
+ static void __exit DAC960_cleanup_module(void)
  {
        int i;
  

diff --combined drivers/block/swim3.c
index e39e382,572ec61..6380ad8
--- 1/drivers/block/swim3.c
--- 2/drivers/block/swim3.c
+++ b/drivers/block/swim3.c
@@@ -998,7 -998,7 +998,7 @@@ static int floppy_revalidate(struct gen
        return ret;
  }
  
 -static struct block_device_operations floppy_fops = {
 +static const struct block_device_operations floppy_fops = {
        .open           = floppy_open,
        .release        = floppy_release,
        .locked_ioctl   = floppy_ioctl,
@@@ -1062,7 -1062,7 +1062,7 @@@ static int swim3_add_device(struct maci
                goto out_release;
        }
        fs->swim3_intr = macio_irq(mdev, 0);
-       fs->dma_intr = macio_irq(mdev, 1);;
+       fs->dma_intr = macio_irq(mdev, 1);
        fs->cur_cyl = -1;
        fs->cur_sector = -1;
        fs->secpercyl = 36;

diff --combined drivers/media/video/cx88/cx88-video.c
index 81d2b5d,bdd1d8a..57e6b12
--- 1/drivers/media/video/cx88/cx88-video.c
--- 2/drivers/media/video/cx88/cx88-video.c
+++ b/drivers/media/video/cx88/cx88-video.c
@@@ -1881,14 -1881,14 +1881,14 @@@ static int __devinit cx8800_initdev(str
  
        if (core->board.audio_chip == V4L2_IDENT_WM8775)
                v4l2_i2c_new_subdev(&core->v4l2_dev, &core->i2c_adap,
 -                              "wm8775", "wm8775", 0x36 >> 1);
 +                              "wm8775", "wm8775", 0x36 >> 1, NULL);
  
        if (core->board.audio_chip == V4L2_IDENT_TVAUDIO) {
                /* This probes for a tda9874 as is used on some
                   Pixelview Ultra boards. */
 -              v4l2_i2c_new_probed_subdev_addr(&core->v4l2_dev,
 +              v4l2_i2c_new_subdev(&core->v4l2_dev,
                                &core->i2c_adap,
 -                              "tvaudio", "tvaudio", 0xb0 >> 1);
 +                              "tvaudio", "tvaudio", 0, I2C_ADDRS(0xb0 >> 1));
        }
  
        switch (core->boardnr) {
@@@ -2113,7 -2113,7 +2113,7 @@@ static struct pci_driver cx8800_pci_dri
  #endif
  };
  
- static int cx8800_init(void)
+ static int __init cx8800_init(void)
  {
        printk(KERN_INFO "cx88/0: cx2388x v4l2 driver version %d.%d.%d loaded\n",
               (CX88_VERSION_CODE >> 16) & 0xff,
@@@ -2126,7 -2126,7 +2126,7 @@@
        return pci_register_driver(&cx8800_pci_driver);
  }
  
- static void cx8800_fini(void)
+ static void __exit cx8800_fini(void)
  {
        pci_unregister_driver(&cx8800_pci_driver);
  }

diff --combined drivers/mtd/ubi/ubi.h
index c290f51,4787794..1af0817
--- 1/drivers/mtd/ubi/ubi.h
--- 2/drivers/mtd/ubi/ubi.h
+++ b/drivers/mtd/ubi/ubi.h
@@@ -570,7 -570,7 +570,7 @@@ void ubi_do_get_volume_info(struct ubi_
  
  /*
   * ubi_rb_for_each_entry - walk an RB-tree.
-  * @rb: a pointer to type 'struct rb_node' to to use as a loop counter
+  * @rb: a pointer to type 'struct rb_node' to use as a loop counter
   * @pos: a pointer to RB-tree entry type to use as a loop counter
   * @root: RB-tree's root
   * @member: the name of the 'struct rb_node' within the RB-tree entry
@@@ -579,8 -579,7 +579,8 @@@
        for (rb = rb_first(root),                                            \
             pos = (rb ? container_of(rb, typeof(*pos), member) : NULL);     \
             rb;                                                             \
 -           rb = rb_next(rb), pos = container_of(rb, typeof(*pos), member))
 +           rb = rb_next(rb),                                               \
 +           pos = (rb ? container_of(rb, typeof(*pos), member) : NULL))
  
  /**
   * ubi_zalloc_vid_hdr - allocate a volume identifier header object.

diff --combined drivers/xen/balloon.c
index 1b7123e,4d1b322..d31505b
--- 1/drivers/xen/balloon.c
--- 2/drivers/xen/balloon.c
+++ b/drivers/xen/balloon.c
@@@ -96,7 -96,11 +96,7 @@@ static struct balloon_stats balloon_sta
  /* We increase/decrease in batches which fit in a page */
  static unsigned long frame_list[PAGE_SIZE / sizeof(unsigned long)];
  
 -/* VM /proc information for memory */
 -extern unsigned long totalram_pages;
 -
  #ifdef CONFIG_HIGHMEM
 -extern unsigned long totalhigh_pages;
  #define inc_totalhigh_pages() (totalhigh_pages++)
  #define dec_totalhigh_pages() (totalhigh_pages--)
  #else
@@@ -210,7 -214,7 +210,7 @@@ static int increase_reservation(unsigne
        page = balloon_first_page();
        for (i = 0; i < nr_pages; i++) {
                BUG_ON(page == NULL);
-               frame_list[i] = page_to_pfn(page);;
+               frame_list[i] = page_to_pfn(page);
                page = balloon_next_page(page);
        }
  

diff --combined fs/cifs/cifs_dfs_ref.c
index 6889c0d,5e8bc99..fea9e89
--- 1/fs/cifs/cifs_dfs_ref.c
--- 2/fs/cifs/cifs_dfs_ref.c
+++ b/fs/cifs/cifs_dfs_ref.c
@@@ -142,7 -142,7 +142,7 @@@ char *cifs_compose_mount_options(const 
        rc = dns_resolve_server_name_to_ip(*devname, &srvIP);
        if (rc != 0) {
                cERROR(1, ("%s: Failed to resolve server part of %s to IP: %d",
-                         __func__, *devname, rc));;
+                         __func__, *devname, rc));
                goto compose_mount_options_err;
        }
        /* md_len = strlen(...) + 12 for 'sep+prefixpath='
@@@ -385,7 -385,7 +385,7 @@@ out_err
        goto out;
  }
  
 -struct inode_operations cifs_dfs_referral_inode_operations = {
 +const struct inode_operations cifs_dfs_referral_inode_operations = {
        .follow_link = cifs_dfs_follow_mountpoint,
  };
  

diff --combined fs/ocfs2/quota_global.c
index 3af4954,0578cc1..3cf0ec0
--- 1/fs/ocfs2/quota_global.c
--- 2/fs/ocfs2/quota_global.c
+++ b/fs/ocfs2/quota_global.c
@@@ -154,7 -154,7 +154,7 @@@ static int ocfs2_get_quota_block(struc
                err = -EIO;
                mlog_errno(err);
        }
-       return err;;
+       return err;
  }
  
  /* Read data from global quotafile - avoid pagecache and such because we cannot
@@@ -849,7 -849,7 +849,7 @@@ static void ocfs2_destroy_dquot(struct 
        kmem_cache_free(ocfs2_dquot_cachep, dquot);
  }
  
 -struct dquot_operations ocfs2_quota_operations = {
 +const struct dquot_operations ocfs2_quota_operations = {
        .initialize     = dquot_initialize,
        .drop           = dquot_drop,
        .alloc_space    = dquot_alloc_space,