Merge branch 'origin' into for-linus

Conflicts:
	MAINTAINERS

diff --combined MAINTAINERS
index 15865e9,e797c4d..c450f3a
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -233,6 -233,7 +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>
@@@ -256,12 -257,6 +257,6 @@@ W:        http://www.lesswatts.org/projects/ac
  S:    Supported
  F:    drivers/acpi/fan.c
  
- ACPI PCI HOTPLUG DRIVER
- M:    Kristen Carlson Accardi <kristen.c.accardi@intel.com>
- L:    linux-pci@vger.kernel.org
- S:    Supported
- F:    drivers/pci/hotplug/acpi*
- 
  ACPI THERMAL DRIVER
  M:    Zhang Rui <rui.zhang@intel.com>
  L:    linux-acpi@vger.kernel.org
@@@ -497,7 -492,7 +492,7 @@@ F: arch/arm/include/asm/floppy.
  
  ARM PORT
  M:    Russell King <linux@arm.linux.org.uk>
- L:    linux-arm-kernel@lists.infradead.org
+ L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  W:    http://www.arm.linux.org.uk/
  S:    Maintained
  F:    arch/arm/
@@@ -508,36 -503,36 +503,36 @@@ F:      drivers/mmc/host/mmci.
  
  ARM/ADI ROADRUNNER MACHINE SUPPORT
  M:    Lennert Buytenhek <kernel@wantstofly.org>
- L:    linux-arm-kernel@lists.infradead.org
+ 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.infradead.org
+ 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.infradead.org
+ 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.infradead.org
+ 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.infradead.org
+ 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.infradead.org
+ L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  F:    arch/arm/mach-bcmring
  
@@@ -554,25 -549,25 +549,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.infradead.org
+ 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.infradead.org
+ 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.infradead.org
+ 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.infradead.org
+ L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  
  ARM/CORGI MACHINE SUPPORT
@@@ -581,14 -576,14 +576,14 @@@ S:      Maintaine
  
  ARM/CORTINA SYSTEMS GEMINI ARM ARCHITECTURE
  M:    Paulius Zaleckas <paulius.zaleckas@teltonika.lt>
- L:    linux-arm-kernel@lists.infradead.org
+ 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.infradead.org
+ 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/
@@@ -606,13 -601,13 +601,13 @@@ F:      arch/arm/mach-pxa/ezx.
  
  ARM/FARADAY FA526 PORT
  M:    Paulius Zaleckas <paulius.zaleckas@teltonika.lt>
- L:    linux-arm-kernel@lists.infradead.org
+ 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.infradead.org
+ 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
@@@ -620,17 -615,17 +615,17 @@@ F:      arch/arm/mach-footbridge
  
  ARM/FREESCALE IMX / MXC ARM ARCHITECTURE
  M:    Sascha Hauer <kernel@pengutronix.de>
- L:    linux-arm-kernel@lists.infradead.org
+ 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.infradead.org
+ 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.infradead.org
+ L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  
  ARM/H4700 (HP IPAQ HX4700) MACHINE SUPPORT
@@@ -650,55 -645,62 +645,62 @@@ 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.infradead.org
+ 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.infradead.org
+ 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.infradead.org
+ 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.infradead.org
+ 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.infradead.org
+ 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.infradead.org
+ 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.infradead.org
+ L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  
 -L:    linux-arm-kernel@lists.infradead.org
+ ARM/INTEL IXP4XX ARM ARCHITECTURE
+ M:    Imre Kaloz <kaloz@openwrt.org>
+ M:    Krzysztof Halasa <khc@pm.waw.pl>
++L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+ S:    Maintained
+ F:    arch/arm/mach-ixp4xx/
+ 
  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.infradead.org
+ 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.infradead.org
+ 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.infradead.org
+ L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  
  ARM/MAGICIAN MACHINE SUPPORT
@@@ -708,7 -710,7 +710,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.infradead.org
+ 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/
@@@ -719,7 -721,7 +721,7 @@@ F: arch/arm/plat-orion
  
  ARM/MIOA701 MACHINE SUPPORT
  M:    Robert Jarzmik <robert.jarzmik@free.fr>
- L:    linux-arm-kernel@lists.infradead.org
+ L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  F:    arch/arm/mach-pxa/mioa701.c
  S:    Maintained
  
@@@ -738,22 -740,18 +740,22 @@@ M:      Dmitry Eremin-Solenikov <dbaryshkov@
  M:    Dirk Opfer <dirk@opfer-online.de>
  S:    Maintained
  
 -ARM/PALMTX,PALMT5,PALMLD,PALMTE2 SUPPORT
 -M:    Marek Vasut <marek.vasut@gmail.com>
 +ARM/PALMTX,PALMT5,PALMLD,PALMTE2,PALMTC SUPPORT
 +P:    Marek Vasut
 +M:    marek.vasut@gmail.com
 +L:    linux-arm-kernel@lists.infradead.org
  W:    http://hackndev.com
  S:    Maintained
  
  ARM/PALM TREO 680 SUPPORT
  M:    Tomas Cech <sleep_walker@suse.cz>
 +L:    linux-arm-kernel@lists.infradead.org
  W:    http://hackndev.com
  S:    Maintained
  
  ARM/PALMZ72 SUPPORT
  M:    Sergey Lapin <slapin@ossfans.org>
 +L:    linux-arm-kernel@lists.infradead.org
  W:    http://hackndev.com
  S:    Maintained
  
@@@ -764,18 -762,18 +766,18 @@@ S:      Maintaine
  
  ARM/PT DIGITAL BOARD PORT
  M:    Stefan Eletzhofer <stefan.eletzhofer@eletztrick.de>
- L:    linux-arm-kernel@lists.infradead.org
+ 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.infradead.org
+ 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.infradead.org
+ 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
@@@ -794,7 -792,7 +796,7 @@@ S: Maintaine
  
  ARM/SAMSUNG ARM ARCHITECTURES
  M:    Ben Dooks <ben-linux@fluff.org>
- L:    linux-arm-kernel@lists.infradead.org
+ 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/
@@@ -802,65 -800,65 +804,65 @@@ F:      arch/arm/plat-s3c24xx
  
  ARM/S3C2410 ARM ARCHITECTURE
  M:    Ben Dooks <ben-linux@fluff.org>
- L:    linux-arm-kernel@lists.infradead.org
+ 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.infradead.org
+ 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.infradead.org
+ 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.infradead.org
+ 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.infradead.org
+ 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.infradead.org
+ 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.infradead.org
+ 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.infradead.org
+ 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.infradead.org
+ 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.infradead.org
+ L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  W:    http://www.arm.linux.org.uk/
  S:    Maintained
  F:    arch/arm/vfp/
@@@ -898,6 -896,13 +900,13 @@@ F:       drivers/dma
  F:    include/linux/dmaengine.h
  F:    include/linux/async_tx.h
  
+ AT24 EEPROM DRIVER
+ M:    Wolfram Sang <w.sang@pengutronix.de>
+ L:    linux-i2c@vger.kernel.org
+ S:    Maintained
+ F:    drivers/misc/eeprom/at24.c
+ F:    include/linux/i2c/at24.h
+ 
  ATA OVER ETHERNET (AOE) DRIVER
  M:    "Ed L. Cashin" <ecashin@coraid.com>
  W:    http://www.coraid.com/support/linux
@@@ -967,7 -972,7 +976,7 @@@ F: include/linux/atm
  
  ATMEL AT91 MCI DRIVER
  M:    Nicolas Ferre <nicolas.ferre@atmel.com>
- L:    linux-arm-kernel@lists.infradead.org
+ 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
@@@ -1545,7 -1550,7 +1554,7 @@@ F:      drivers/infiniband/hw/cxgb3
  
  CYBERPRO FB DRIVER
  M:    Russell King <linux@arm.linux.org.uk>
- L:    linux-arm-kernel@lists.infradead.org
+ L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  W:    http://www.arm.linux.org.uk/
  S:    Maintained
  F:    drivers/video/cyber2000fb.*
@@@ -1977,7 -1982,6 +1986,6 @@@ F:      fs/ext2
  F:    include/linux/ext2*
  
  EXT3 FILE SYSTEM
- M:    Stephen Tweedie <sct@redhat.com>
  M:    Andrew Morton <akpm@linux-foundation.org>
  M:    Andreas Dilger <adilger@sun.com>
  L:    linux-ext4@vger.kernel.org
@@@ -2090,7 -2094,7 +2098,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.infradead.org
+ 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
@@@ -2111,12 -2115,12 +2119,12 @@@ S:   Supporte
  F:    arch/powerpc/sysdev/qe_lib/
  F:    arch/powerpc/include/asm/*qe.h
  
- FREESCALE HIGHSPEED USB DEVICE DRIVER
+ FREESCALE USB PERIPHERIAL DRIVERS
  M:    Li Yang <leoli@freescale.com>
  L:    linux-usb@vger.kernel.org
  L:    linuxppc-dev@ozlabs.org
  S:    Maintained
- F:    drivers/usb/gadget/fsl_usb2_udc.c
+ F:    drivers/usb/gadget/fsl*
  
  FREESCALE QUICC ENGINE UCC ETHERNET DRIVER
  M:    Li Yang <leoli@freescale.com>
@@@ -2321,7 -2325,9 +2329,9 @@@ S:      Orpha
  F:    drivers/hwmon/
  
  HARDWARE RANDOM NUMBER GENERATOR CORE
- S:    Orphan
+ M:    Matt Mackall <mpm@selenic.com>
+ M:    Herbert Xu <herbert@gondor.apana.org.au>
+ S:    Odd fixes
  F:    Documentation/hw_random.txt
  F:    drivers/char/hw_random/
  F:    include/linux/hw_random.h
@@@ -2808,6 -2814,8 +2818,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
@@@ -2905,8 -2913,8 +2917,8 @@@ F:      fs/jffs2
  F:    include/linux/jffs2.h
  
  JOURNALLING LAYER FOR BLOCK DEVICES (JBD)
- M:    Stephen Tweedie <sct@redhat.com>
  M:    Andrew Morton <akpm@linux-foundation.org>
+ M:    Jan Kara <jack@suse.cz>
  L:    linux-ext4@vger.kernel.org
  S:    Maintained
  F:    fs/jbd*/
@@@ -2960,7 -2968,7 +2972,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>
@@@ -3454,7 -3462,7 +3466,7 @@@ F:      include/linux/meye.
  
  MOTOROLA IMX MMC/SD HOST CONTROLLER INTERFACE DRIVER
  M:    Pavel Pisa <ppisa@pikron.com>
- L:    linux-arm-kernel@lists.infradead.org
+ L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  F:    drivers/mmc/host/imxmmc.*
  
@@@ -3529,7 -3537,6 +3541,6 @@@ F:      drivers/net/natsemi.
  
  NCP FILESYSTEM
  M:    Petr Vandrovec <vandrove@vc.cvut.cz>
- L:    linware@sh.cvut.cz
  S:    Maintained
  F:    fs/ncpfs/
  
@@@ -3739,7 -3746,7 +3750,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>
@@@ -3771,7 -3778,13 +3782,13 @@@ OMAP MMC SUPPOR
  M:    Jarkko Lavinen <jarkko.lavinen@nokia.com>
  L:    linux-omap@vger.kernel.org
  S:    Maintained
- F:    drivers/mmc/host/*omap*
+ F:    drivers/mmc/host/omap.c
+ 
+ OMAP HS MMC SUPPORT
+ M:    Madhusudhan Chikkature <madhu.cr@ti.com>
+ L:    linux-omap@vger.kernel.org
+ S:    Maintained
+ F:    drivers/mmc/host/omap_hsmmc.c
  
  OMAP RANDOM NUMBER GENERATOR SUPPORT
  M:    Deepak Saxena <dsaxena@plexity.net>
@@@ -3961,6 -3974,15 +3978,15 @@@ S:    Maintaine
  F:    drivers/leds/leds-pca9532.c
  F:    include/linux/leds-pca9532.h
  
+ PCA9564/PCA9665 I2C BUS DRIVER
+ M:    Wolfram Sang <w.sang@pengutronix.de>
+ L:    linux-i2c@vger.kernel.org
+ S:    Maintained
+ F:    drivers/i2c/algos/i2c-algo-pca.c
+ F:    drivers/i2c/busses/i2c-pca-*
+ F:    include/linux/i2c-algo-pca.h
+ F:    include/linux/i2c-pca-platform.h
+ 
  PCI ERROR RECOVERY
  M:    Linas Vepstas <linas@austin.ibm.com>
  L:    linux-pci@vger.kernel.org
@@@ -3977,11 -3999,11 +4003,11 @@@ F:   Documentation/PCI
  F:    drivers/pci/
  F:    include/linux/pci*
  
- PCIE HOTPLUG DRIVER
- M:    Kristen Carlson Accardi <kristen.c.accardi@intel.com>
+ PCI HOTPLUG
+ M:    Jesse Barnes <jbarnes@virtuousgeek.org>
  L:    linux-pci@vger.kernel.org
  S:    Supported
- F:    drivers/pci/pcie/
+ F:    drivers/pci/hotplug
  
  PCMCIA SUBSYSTEM
  P:    Linux PCMCIA Team
@@@ -4005,7 -4027,7 +4031,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>
@@@ -4030,8 -4052,7 +4056,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
@@@ -4173,7 -4194,7 +4198,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.infradead.org
+ L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  F:    arch/arm/mach-pxa/
  F:    drivers/pcmcia/pxa2xx*
@@@ -4186,13 -4207,13 +4211,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.infradead.org
+ 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.infradead.org
+ 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
  
@@@ -4433,7 -4454,7 +4458,7 @@@ F:      net/iucv
  
  S3C24XX SD/MMC Driver
  M:    Ben Dooks <ben-linux@fluff.org>
- L:    linux-arm-kernel@lists.infradead.org
+ L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Supported
  F:    drivers/mmc/host/s3cmci.*
  
@@@ -4459,6 -4480,14 +4484,14 @@@ S:    Maintaine
  F:    kernel/sched*
  F:    include/linux/sched.h
  
+ SCORE ARCHITECTURE
+ P:    Chen Liqin
+ M:    liqin.chen@sunplusct.com
+ P:    Lennox Wu
+ M:    lennox.wu@gmail.com
+ W:    http://www.sunplusct.com
+ S:    Supported
+ 
  SCSI CDROM DRIVER
  M:    Jens Axboe <axboe@kernel.dk>
  L:    linux-scsi@vger.kernel.org
@@@ -4530,20 -4559,20 +4563,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
  
@@@ -4629,7 -4658,7 +4662,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.infradead.org
+ 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/
@@@ -4637,11 -4666,16 +4670,16 @@@ F:   drivers/serial/serial_lh7a40x.
  F:    drivers/usb/gadget/lh7a40*
  F:    drivers/usb/host/ohci-lh7a40*
  
- SHPC HOTPLUG DRIVER
- M:    Kristen Carlson Accardi <kristen.c.accardi@intel.com>
- L:    linux-pci@vger.kernel.org
+ SIMPLE FIRMWARE INTERFACE (SFI)
+ P:    Len Brown
+ M:    lenb@kernel.org
+ L:    sfi-devel@simplefirmware.org
+ W:    http://simplefirmware.org/
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-sfi-2.6.git
  S:    Supported
- F:    drivers/pci/hotplug/shpchp*
+ F:    arch/x86/kernel/*sfi*
+ F:    drivers/sfi/
+ F:    include/linux/sfi*.h
  
  SIMTEC EB110ATX (Chalice CATS)
  P:    Ben Dooks
@@@ -4658,6 -4692,12 +4696,12 @@@ F:    arch/arm/mach-s3c2410
  F:    drivers/*/*s3c2410*
  F:    drivers/*/*/*s3c2410*
  
+ TI DAVINCI MACHINE SUPPORT
+ P:    Kevin Hilman
+ M:    davinci-linux-open-source@linux.davincidsp.com
+ S:    Supported
+ F:    arch/arm/mach-davinci
+ 
  SIS 190 ETHERNET DRIVER
  M:    Francois Romieu <romieu@fr.zoreil.com>
  L:    netdev@vger.kernel.org
@@@ -5037,6 -5077,11 +5081,11 @@@ T:    quilt http://svn.sourceforge.jp/svnr
  S:    Maintained
  F:    security/tomoyo/
  
+ TOPSTAR LAPTOP EXTRAS DRIVER
+ M:    Herton Ronaldo Krzesinski <herton@mandriva.com.br>
+ S:    Maintained
+ F:    drivers/platform/x86/topstar-laptop.c
+ 
  TOSHIBA ACPI EXTRAS DRIVER
  S:    Orphan
  F:    drivers/platform/x86/toshiba_acpi.c
@@@ -5629,6 -5674,12 +5678,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
@@@ -5648,8 -5699,7 +5703,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
@@@ -5682,6 -5732,26 +5736,26 @@@ S:    Supporte
  F:    drivers/input/touchscreen/*wm97*
  F:    include/linux/wm97xx.h
  
+ WOLFSON MICROELECTRONICS PMIC DRIVERS
+ P:    Mark Brown
+ M:    broonie@opensource.wolfsonmicro.com
+ L:    linux-kernel@vger.kernel.org
+ T:    git git://opensource.wolfsonmicro.com/linux-2.6-audioplus
+ W:    http://opensource.wolfsonmicro.com/node/8
+ S:    Supported
+ F:    drivers/leds/leds-wm83*.c
+ F:    drivers/mfd/wm8*.c
+ F:    drivers/power/wm83*.c
+ F:    drivers/rtc/rtc-wm83*.c
+ F:    drivers/regulator/wm8*.c
+ F:    drivers/video/backlight/wm83*_bl.c
+ F:    drivers/watchdog/wm83*_wdt.c
+ F:    include/linux/mfd/wm831x/
+ F:    include/linux/mfd/wm8350/
+ F:    include/linux/mfd/wm8400/
+ F:    sound/soc/codecs/wm8350.c
+ F:    sound/soc/codecs/wm8400.c
+ 
  X.25 NETWORK LAYER
  M:    Henner Eisen <eis@baty.hanse.de>
  L:    linux-x25@vger.kernel.org

diff --combined arch/arm/kernel/Makefile
index 6808e01,c446aef..79087dd
--- 1/arch/arm/kernel/Makefile
--- 2/arch/arm/kernel/Makefile
+++ b/arch/arm/kernel/Makefile
@@@ -2,7 -2,8 +2,8 @@@
  # Makefile for the linux kernel.
  #
  
- AFLAGS_head.o := -DTEXT_OFFSET=$(TEXT_OFFSET)
+ CPPFLAGS_vmlinux.lds := -DTEXT_OFFSET=$(TEXT_OFFSET)
+ AFLAGS_head.o        := -DTEXT_OFFSET=$(TEXT_OFFSET)
  
  ifdef CONFIG_DYNAMIC_FTRACE
  CFLAGS_REMOVE_ftrace.o = -pg
@@@ -34,7 -35,6 +35,7 @@@ obj-$(CONFIG_OABI_COMPAT)     += sys_oabi-c
  obj-$(CONFIG_ARM_THUMBEE)     += thumbee.o
  obj-$(CONFIG_KGDB)            += kgdb.o
  obj-$(CONFIG_ARM_UNWIND)      += unwind.o
 +obj-$(CONFIG_HAVE_TCM)                += tcm.o
  
  obj-$(CONFIG_CRUNCH)          += crunch.o crunch-bits.o
  AFLAGS_crunch-bits.o          := -Wa,-mcpu=ep9312

diff --combined arch/arm/mach-at91/board-neocore926.c
index f78a55e,8c0b71c..7c1e382
--- 1/arch/arm/mach-at91/board-neocore926.c
--- 2/arch/arm/mach-at91/board-neocore926.c
+++ b/arch/arm/mach-at91/board-neocore926.c
@@@ -56,7 -56,7 +56,7 @@@ static void __init neocore926_map_io(vo
        /* Initialize processor: 20 MHz crystal */
        at91sam9263_initialize(20000000);
  
-       /* DGBU on ttyS0. (Rx & Tx only) */
+       /* DBGU on ttyS0. (Rx & Tx only) */
        at91_register_uart(0, 0, 0);
  
        /* USART0 on ttyS1. (Rx, Tx, RTS, CTS) */
@@@ -340,7 -340,7 +340,7 @@@ static void __init neocore926_add_devic
  /*
   * AC97
   */
 -static struct atmel_ac97_data neocore926_ac97_data = {
 +static struct ac97c_platform_data neocore926_ac97_data = {
        .reset_pin      = AT91_PIN_PA13,
  };
  

diff --combined arch/arm/mach-at91/board-sam9rlek.c
index cde0565,94ffb5c..bd28e98
--- 1/arch/arm/mach-at91/board-sam9rlek.c
--- 2/arch/arm/mach-at91/board-sam9rlek.c
+++ b/arch/arm/mach-at91/board-sam9rlek.c
@@@ -43,7 -43,7 +43,7 @@@ static void __init ek_map_io(void
        /* Initialize processor: 12.000 MHz crystal */
        at91sam9rl_initialize(12000000);
  
-       /* DGBU on ttyS0. (Rx & Tx only) */
+       /* DBGU on ttyS0. (Rx & Tx only) */
        at91_register_uart(0, 0, 0);
  
        /* USART0 on ttyS1. (Rx, Tx, CTS, RTS) */
@@@ -210,14 -210,6 +210,14 @@@ static struct atmel_lcdfb_info __initda
  #endif
  
  
 +/*
 + * AC97
 + * reset_pin is not connected: NRST
 + */
 +static struct ac97c_platform_data ek_ac97_data = {
 +};
 +
 +
  /*
   * LEDs
   */
@@@ -307,8 -299,6 +307,8 @@@ static void __init ek_board_init(void
        at91_add_device_mmc(0, &ek_mmc_data);
        /* LCD Controller */
        at91_add_device_lcdc(&ek_lcdc_data);
 +      /* AC97 */
 +      at91_add_device_ac97(&ek_ac97_data);
        /* Touch Screen Controller */
        at91_add_device_tsadcc();
        /* LEDs */

diff --combined arch/arm/mm/init.c
index 764d5dc,f982606..877c492
--- 1/arch/arm/mm/init.c
--- 2/arch/arm/mm/init.c
+++ b/arch/arm/mm/init.c
@@@ -596,8 -596,8 +596,8 @@@ void __init mem_init(void
  
        printk(KERN_NOTICE "Memory: %luKB available (%dK code, "
                "%dK data, %dK init, %luK highmem)\n",
-               (unsigned long) nr_free_pages() << (PAGE_SHIFT-10),
-               codesize >> 10, datasize >> 10, initsize >> 10,
+               nr_free_pages() << (PAGE_SHIFT-10), codesize >> 10,
+               datasize >> 10, initsize >> 10,
                (unsigned long) (totalhigh_pages << (PAGE_SHIFT-10)));
  
        if (PAGE_SIZE >= 16384 && num_physpages <= 128) {
@@@ -613,14 -613,6 +613,14 @@@
  
  void free_initmem(void)
  {
 +#ifdef CONFIG_HAVE_TCM
 +      extern char *__tcm_start, *__tcm_end;
 +
 +      totalram_pages += free_area(__phys_to_pfn(__pa(__tcm_start)),
 +                                  __phys_to_pfn(__pa(__tcm_end)),
 +                                  "TCM link");
 +#endif
 +
        if (!machine_is_integrator() && !machine_is_cintegrator())
                totalram_pages += free_area(__phys_to_pfn(__pa(__init_begin)),
                                            __phys_to_pfn(__pa(__init_end)),

diff --combined drivers/i2c/busses/Kconfig
index 834a034,6bedd2f..737335f
--- 1/drivers/i2c/busses/Kconfig
--- 2/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@@ -113,7 -113,7 +113,7 @@@ config I2C_ISC
          will be called i2c-isch.
  
  config I2C_PIIX4
-       tristate "Intel PIIX4 and compatible (ATI/Serverworks/Broadcom/SMSC)"
+       tristate "Intel PIIX4 and compatible (ATI/AMD/Serverworks/Broadcom/SMSC)"
        depends on PCI
        help
          If you say yes to this option, support will be included for the Intel
@@@ -128,6 -128,7 +128,7 @@@
            ATI SB600
            ATI SB700
            ATI SB800
+           AMD SB900
            Serverworks OSB4
            Serverworks CSB5
            Serverworks CSB6
@@@ -231,6 -232,22 +232,22 @@@ config I2C_VIAPR
          This driver can also be built as a module.  If so, the module
          will be called i2c-viapro.
  
+ if ACPI
+ 
+ comment "ACPI drivers"
+ 
+ config I2C_SCMI
+       tristate "SMBus Control Method Interface"
+       help
+         This driver supports the SMBus Control Method Interface. It needs the
+         BIOS to declare ACPI control methods as described in the SMBus Control
+         Method Interface specification.
+ 
+         To compile this driver as a module, choose M here:
+         the module will be called i2c-scmi.
+ 
+ endif # ACPI
+ 
  comment "Mac SMBus host controller drivers"
        depends on PPC_CHRP || PPC_PMAC
  
@@@ -460,8 -477,8 +477,8 @@@ config I2C_PN
          will be called i2c-pnx.
  
  config I2C_PXA
 -      tristate "Intel PXA2XX I2C adapter (EXPERIMENTAL)"
 -      depends on EXPERIMENTAL && ARCH_PXA
 +      tristate "Intel PXA2XX I2C adapter"
 +      depends on ARCH_PXA || ARCH_MMP
        help
          If you have devices in the PXA I2C bus, say yes to this option.
          This driver can also be built as a module.  If so, the module

diff --combined drivers/serial/pxa.c
index 514971f,6443b7f..b8629d7
--- 1/drivers/serial/pxa.c
--- 2/drivers/serial/pxa.c
+++ b/drivers/serial/pxa.c
@@@ -96,7 -96,7 +96,7 @@@ static void serial_pxa_stop_rx(struct u
  
  static inline void receive_chars(struct uart_pxa_port *up, int *status)
  {
-       struct tty_struct *tty = up->port.info->port.tty;
+       struct tty_struct *tty = up->port.state->port.tty;
        unsigned int ch, flag;
        int max_count = 256;
  
@@@ -161,7 -161,7 +161,7 @@@
  
  static void transmit_chars(struct uart_pxa_port *up)
  {
-       struct circ_buf *xmit = &up->port.info->xmit;
+       struct circ_buf *xmit = &up->port.state->xmit;
        int count;
  
        if (up->port.x_char) {
@@@ -220,7 -220,7 +220,7 @@@ static inline void check_modem_status(s
        if (status & UART_MSR_DCTS)
                uart_handle_cts_change(&up->port, status & UART_MSR_CTS);
  
-       wake_up_interruptible(&up->port.info->delta_msr_wait);
+       wake_up_interruptible(&up->port.state->port.delta_msr_wait);
  }
  
  /*
@@@ -726,10 -726,9 +726,10 @@@ static struct uart_driver serial_pxa_re
        .cons           = PXA_CONSOLE,
  };
  
 -static int serial_pxa_suspend(struct platform_device *dev, pm_message_t state)
 +#ifdef CONFIG_PM
 +static int serial_pxa_suspend(struct device *dev)
  {
 -        struct uart_pxa_port *sport = platform_get_drvdata(dev);
 +        struct uart_pxa_port *sport = dev_get_drvdata(dev);
  
          if (sport)
                  uart_suspend_port(&serial_pxa_reg, &sport->port);
@@@ -737,9 -736,9 +737,9 @@@
          return 0;
  }
  
 -static int serial_pxa_resume(struct platform_device *dev)
 +static int serial_pxa_resume(struct device *dev)
  {
 -        struct uart_pxa_port *sport = platform_get_drvdata(dev);
 +        struct uart_pxa_port *sport = dev_get_drvdata(dev);
  
          if (sport)
                  uart_resume_port(&serial_pxa_reg, &sport->port);
@@@ -747,12 -746,6 +747,12 @@@
          return 0;
  }
  
 +static struct dev_pm_ops serial_pxa_pm_ops = {
 +      .suspend        = serial_pxa_suspend,
 +      .resume         = serial_pxa_resume,
 +};
 +#endif
 +
  static int serial_pxa_probe(struct platform_device *dev)
  {
        struct uart_pxa_port *sport;
@@@ -832,12 -825,11 +832,12 @@@ static struct platform_driver serial_px
          .probe          = serial_pxa_probe,
          .remove         = serial_pxa_remove,
  
 -      .suspend        = serial_pxa_suspend,
 -      .resume         = serial_pxa_resume,
        .driver         = {
                .name   = "pxa2xx-uart",
                .owner  = THIS_MODULE,
 +#ifdef CONFIG_PM
 +              .pm     = &serial_pxa_pm_ops,
 +#endif
        },
  };
  

diff --combined drivers/spi/pxa2xx_spi.c
index 8a1fb60,31dd56f..c8c2b69
--- 1/drivers/spi/pxa2xx_spi.c
--- 2/drivers/spi/pxa2xx_spi.c
+++ b/drivers/spi/pxa2xx_spi.c
@@@ -1668,9 -1668,10 +1668,9 @@@ static void pxa2xx_spi_shutdown(struct 
  }
  
  #ifdef CONFIG_PM
 -
 -static int pxa2xx_spi_suspend(struct platform_device *pdev, pm_message_t state)
 +static int pxa2xx_spi_suspend(struct device *dev)
  {
 -      struct driver_data *drv_data = platform_get_drvdata(pdev);
 +      struct driver_data *drv_data = dev_get_drvdata(dev);
        struct ssp_device *ssp = drv_data->ssp;
        int status = 0;
  
@@@ -1683,9 -1684,9 +1683,9 @@@
        return 0;
  }
  
 -static int pxa2xx_spi_resume(struct platform_device *pdev)
 +static int pxa2xx_spi_resume(struct device *dev)
  {
 -      struct driver_data *drv_data = platform_get_drvdata(pdev);
 +      struct driver_data *drv_data = dev_get_drvdata(dev);
        struct ssp_device *ssp = drv_data->ssp;
        int status = 0;
  
@@@ -1702,36 -1703,33 +1702,36 @@@
        /* Start the queue running */
        status = start_queue(drv_data);
        if (status != 0) {
 -              dev_err(&pdev->dev, "problem starting queue (%d)\n", status);
 +              dev_err(dev, "problem starting queue (%d)\n", status);
                return status;
        }
  
        return 0;
  }
 -#else
 -#define pxa2xx_spi_suspend NULL
 -#define pxa2xx_spi_resume NULL
 -#endif /* CONFIG_PM */
 +
 +static struct dev_pm_ops pxa2xx_spi_pm_ops = {
 +      .suspend        = pxa2xx_spi_suspend,
 +      .resume         = pxa2xx_spi_resume,
 +};
 +#endif
  
  static struct platform_driver driver = {
        .driver = {
 -              .name = "pxa2xx-spi",
 -              .owner = THIS_MODULE,
 +              .name   = "pxa2xx-spi",
 +              .owner  = THIS_MODULE,
 +#ifdef CONFIG_PM
 +              .pm     = &pxa2xx_spi_pm_ops,
 +#endif
        },
        .remove = pxa2xx_spi_remove,
        .shutdown = pxa2xx_spi_shutdown,
 -      .suspend = pxa2xx_spi_suspend,
 -      .resume = pxa2xx_spi_resume,
  };
  
  static int __init pxa2xx_spi_init(void)
  {
        return platform_driver_probe(&driver, pxa2xx_spi_probe);
  }
- module_init(pxa2xx_spi_init);
+ subsys_initcall(pxa2xx_spi_init);
  
  static void __exit pxa2xx_spi_exit(void)
  {

diff --combined drivers/usb/host/ohci-pxa27x.c
index bbc0c3b,b5294a9..f1c0620
--- 1/drivers/usb/host/ohci-pxa27x.c
--- 2/drivers/usb/host/ohci-pxa27x.c
+++ b/drivers/usb/host/ohci-pxa27x.c
@@@ -177,9 -177,13 +177,13 @@@ static inline void pxa27x_setup_hc(stru
  
        if (inf->flags & NO_OC_PROTECTION)
                uhcrhda |= UHCRHDA_NOCP;
+       else
+               uhcrhda &= ~UHCRHDA_NOCP;
  
        if (inf->flags & OC_MODE_PERPORT)
                uhcrhda |= UHCRHDA_OCPM;
+       else
+               uhcrhda &= ~UHCRHDA_OCPM;
  
        if (inf->power_on_delay) {
                uhcrhda &= ~UHCRHDA_POTPGT(0xff);
@@@ -477,47 -481,38 +481,47 @@@ static int ohci_hcd_pxa27x_drv_remove(s
        return 0;
  }
  
 -#ifdef        CONFIG_PM
 -static int ohci_hcd_pxa27x_drv_suspend(struct platform_device *pdev, pm_message_t state)
 +#ifdef CONFIG_PM
 +static int ohci_hcd_pxa27x_drv_suspend(struct device *dev)
  {
 -      struct usb_hcd *hcd = platform_get_drvdata(pdev);
 +      struct usb_hcd *hcd = dev_get_drvdata(dev);
        struct pxa27x_ohci *ohci = to_pxa27x_ohci(hcd);
  
        if (time_before(jiffies, ohci->ohci.next_statechange))
                msleep(5);
        ohci->ohci.next_statechange = jiffies;
  
 -      pxa27x_stop_hc(ohci, &pdev->dev);
 +      pxa27x_stop_hc(ohci, dev);
        hcd->state = HC_STATE_SUSPENDED;
  
        return 0;
  }
  
 -static int ohci_hcd_pxa27x_drv_resume(struct platform_device *pdev)
 +static int ohci_hcd_pxa27x_drv_resume(struct device *dev)
  {
 -      struct usb_hcd *hcd = platform_get_drvdata(pdev);
 +      struct usb_hcd *hcd = dev_get_drvdata(dev);
        struct pxa27x_ohci *ohci = to_pxa27x_ohci(hcd);
 +      struct pxaohci_platform_data *inf = dev->platform_data;
        int status;
  
        if (time_before(jiffies, ohci->ohci.next_statechange))
                msleep(5);
        ohci->ohci.next_statechange = jiffies;
  
 -      if ((status = pxa27x_start_hc(ohci, &pdev->dev)) < 0)
 +      if ((status = pxa27x_start_hc(ohci, dev)) < 0)
                return status;
  
 +      /* Select Power Management Mode */
 +      pxa27x_ohci_select_pmm(ohci, inf->port_mode);
 +
        ohci_finish_controller_resume(hcd);
        return 0;
  }
 +
 +static struct dev_pm_ops ohci_hcd_pxa27x_pm_ops = {
 +      .suspend        = ohci_hcd_pxa27x_drv_suspend,
 +      .resume         = ohci_hcd_pxa27x_drv_resume,
 +};
  #endif
  
  /* work with hotplug and coldplug */
@@@ -527,12 -522,13 +531,12 @@@ static struct platform_driver ohci_hcd_
        .probe          = ohci_hcd_pxa27x_drv_probe,
        .remove         = ohci_hcd_pxa27x_drv_remove,
        .shutdown       = usb_hcd_platform_shutdown,
 -#ifdef CONFIG_PM
 -      .suspend        = ohci_hcd_pxa27x_drv_suspend,
 -      .resume         = ohci_hcd_pxa27x_drv_resume,
 -#endif
        .driver         = {
                .name   = "pxa27x-ohci",
                .owner  = THIS_MODULE,
 +#ifdef CONFIG_PM
 +              .pm     = &ohci_hcd_pxa27x_pm_ops,
 +#endif
        },
  };