Merge branch 'sfi-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb...

* 'sfi-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-sfi-2.6:
  SFI: remove unneeded includes
  sfi: Remove unused code
  SFI: Hook PCI MMCONFIG
  x86: add arch-specific SFI support
  SFI: add capability to parse ACPI tables
  SFI: add platform-independent core support
  SFI: create linux/sfi.h
  SFI: Simple Firmware Interface - MAINTAINERS, Kconfig

diff --combined MAINTAINERS
index a44ea122f2adf142c7e4010cce67c356ee60015a,81061c3ddccfbf811548017b0e4e2f192aa73a15..8f6297881077993c9618b4ee106d527ba19beeab
--- 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/
@@@ -895,13 -894,6 +895,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
@@@ -971,7 -963,7 +971,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
@@@ -1549,7 -1541,7 +1549,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.*
@@@ -2093,7 -2085,7 +2093,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
@@@ -2114,12 -2106,12 +2114,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>
@@@ -2811,8 -2803,6 +2811,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
@@@ -2965,7 -2955,7 +2965,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>
@@@ -3459,7 -3449,7 +3459,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.*
  
@@@ -3534,6 -3524,7 +3534,6 @@@ F:      drivers/net/natsemi.
  
  NCP FILESYSTEM
  M:    Petr Vandrovec <vandrove@vc.cvut.cz>
 -L:    linware@sh.cvut.cz
  S:    Maintained
  F:    fs/ncpfs/
  
@@@ -3743,7 -3734,7 +3743,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>
@@@ -3775,13 -3766,7 +3775,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>
@@@ -3971,15 -3956,6 +3971,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
@@@ -4024,7 -4000,7 +4024,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>
@@@ -4049,7 -4025,8 +4049,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
@@@ -4191,7 -4168,7 +4191,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*
@@@ -4204,13 -4181,13 +4204,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
  
@@@ -4451,7 -4428,7 +4451,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.*
  
@@@ -4481,7 -4458,7 +4481,7 @@@ SCORE ARCHITECTUR
  P:    Chen Liqin
  M:    liqin.chen@sunplusct.com
  P:    Lennox Wu
 -M:    lennox.wu@sunplusct.com
 +M:    lennox.wu@gmail.com
  W:    http://www.sunplusct.com
  S:    Supported
  
@@@ -4556,20 -4533,20 +4556,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
  
@@@ -4655,7 -4632,7 +4655,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/
@@@ -4669,6 -4646,18 +4669,18 @@@ L:    linux-pci@vger.kernel.or
  S:    Supported
  F:    drivers/pci/hotplug/shpchp*
  
+ 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:    arch/x86/kernel/*sfi*
+ F:    drivers/sfi/
+ F:    include/linux/sfi*.h
+ 
+ 
  SIMTEC EB110ATX (Chalice CATS)
  P:    Ben Dooks
  M:    Vincent Sanders <support@simtec.co.uk>
@@@ -5069,11 -5058,6 +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
@@@ -5666,12 -5650,6 +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
@@@ -5691,7 -5669,8 +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

diff --combined arch/x86/Kconfig
index 7c7a54bed4a6e6cda3e2f82a14d484c86c59372f,1c9a1811c9c5fb6ef7af1c44cc6410cd5b1bf776..74d647ecf905308743ed5524c610516d7be0525c
--- 1/arch/x86/Kconfig
--- 2/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@@ -24,7 -24,7 +24,7 @@@ config X8
        select HAVE_UNSTABLE_SCHED_CLOCK
        select HAVE_IDE
        select HAVE_OPROFILE
 -      select HAVE_PERF_COUNTERS if (!M386 && !M486)
 +      select HAVE_PERF_EVENTS if (!M386 && !M486)
        select HAVE_IOREMAP_PROT
        select HAVE_KPROBES
        select ARCH_WANT_OPTIONAL_GPIOLIB
@@@ -1204,10 -1204,6 +1204,10 @@@ config ARCH_DISCONTIGMEM_DEFAUL
        def_bool y
        depends on NUMA && X86_32
  
 +config ARCH_PROC_KCORE_TEXT
 +      def_bool y
 +      depends on X86_64 && PROC_KCORE
 +
  config ARCH_SPARSEMEM_DEFAULT
        def_bool y
        depends on X86_64
@@@ -1666,6 -1662,8 +1666,8 @@@ source "kernel/power/Kconfig
  
  source "drivers/acpi/Kconfig"
  
+ source "drivers/sfi/Kconfig"
+ 
  config X86_APM_BOOT
        bool
        default y
@@@ -1861,7 -1859,7 +1863,7 @@@ config PCI_DIREC
  
  config PCI_MMCONFIG
        def_bool y
-       depends on X86_32 && PCI && ACPI && (PCI_GOMMCONFIG || PCI_GOANY)
+       depends on X86_32 && PCI && (ACPI || SFI) && (PCI_GOMMCONFIG || PCI_GOANY)
  
  config PCI_OLPC
        def_bool y

diff --combined arch/x86/kernel/setup.c
index f327bccf5089530bbdfe9650c90a83d13fd45d2a,6c7886890fa6ed1b1f57464bf1114f1ec044989c..e09f0e2c14b5e83487b91a9a02049a802a7830ef
--- 1/arch/x86/kernel/setup.c
--- 2/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@@ -27,6 -27,7 +27,7 @@@
  #include <linux/screen_info.h>
  #include <linux/ioport.h>
  #include <linux/acpi.h>
+ #include <linux/sfi.h>
  #include <linux/apm_bios.h>
  #include <linux/initrd.h>
  #include <linux/bootmem.h>
@@@ -697,6 -698,21 +698,6 @@@ void __init setup_arch(char **cmdline_p
        printk(KERN_INFO "Command line: %s\n", boot_command_line);
  #endif
  
 -      strlcpy(command_line, boot_command_line, COMMAND_LINE_SIZE);
 -      *cmdline_p = command_line;
 -
 -#ifdef CONFIG_X86_64
 -      /*
 -       * Must call this twice: Once just to detect whether hardware doesn't
 -       * support NX (so that the early EHCI debug console setup can safely
 -       * call set_fixmap(), and then again after parsing early parameters to
 -       * honor the respective command line option.
 -       */
 -      check_efer();
 -#endif
 -
 -      parse_early_param();
 -
        /* VMI may relocate the fixmap; do this before touching ioremap area */
        vmi_init();
  
@@@ -779,21 -795,6 +780,21 @@@
  #endif
  #endif
  
 +      strlcpy(command_line, boot_command_line, COMMAND_LINE_SIZE);
 +      *cmdline_p = command_line;
 +
 +#ifdef CONFIG_X86_64
 +      /*
 +       * Must call this twice: Once just to detect whether hardware doesn't
 +       * support NX (so that the early EHCI debug console setup can safely
 +       * call set_fixmap(), and then again after parsing early parameters to
 +       * honor the respective command line option.
 +       */
 +      check_efer();
 +#endif
 +
 +      parse_early_param();
 +
  #ifdef CONFIG_X86_64
        check_efer();
  #endif
@@@ -984,6 -985,8 +985,8 @@@
         * Read APIC and some other early information from ACPI tables.
         */
        acpi_boot_init();
+ 
+       sfi_init();
  
        /*
         * get boot-time SMP configuration:

diff --combined init/main.c
index 2c48c31531635a34a01cbd9e2d02a055f5975b7a,a2086913a17b1da939d9ae111ae28e087f4dfe49..6107223124e4579a663dde4cb26e91aab68191c1
--- 1/init/main.c
--- 2/init/main.c
+++ b/init/main.c
@@@ -68,6 -68,7 +68,7 @@@
  #include <linux/async.h>
  #include <linux/kmemcheck.h>
  #include <linux/kmemtrace.h>
+ #include <linux/sfi.h>
  #include <linux/shmem_fs.h>
  #include <trace/boot.h>
  
@@@ -668,12 -669,12 +669,12 @@@ asmlinkage void __init start_kernel(voi
  #endif
        thread_info_cache_init();
        cred_init();
 -      fork_init(num_physpages);
 +      fork_init(totalram_pages);
        proc_caches_init();
        buffer_init();
        key_init();
        security_init();
 -      vfs_caches_init(num_physpages);
 +      vfs_caches_init(totalram_pages);
        radix_tree_init();
        signals_init();
        /* rootfs populating might need page-writeback */
@@@ -689,6 -690,7 +690,7 @@@
        check_bugs();
  
        acpi_early_init(); /* before LAPIC and SMP init */
+       sfi_init_late();
  
        ftrace_init();