Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes...

* 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6: (21 commits)
  x86/PCI: make 32 bit NUMA node array int, not unsigned char
  x86/PCI: default pcibus cpumask to all cpus if it lacks affinity
  MAINTAINTERS: remove hotplug driver entries
  PCI: pciehp: remove slot capabilities definitions
  PCI: pciehp: remove error message definitions
  PCI: pciehp: remove number field
  PCI: pciehp: remove hpc_ops
  PCI: pciehp: remove pci_dev field
  PCI: pciehp: remove crit_sect mutex
  PCI: pciehp: remove slot_bus field
  PCI: pciehp: remove first_slot field
  PCI: pciehp: remove slot_device_offset field
  PCI: pciehp: remove hp_slot field
  PCI: pciehp: remove device field
  PCI: pciehp: remove bus field
  PCI: pciehp: remove slot_num_inc field
  PCI: pciehp: remove num_slots field
  PCI: pciehp: remove slot_list field
  PCI: fix VGA arbiter header file
  PCI: Disable AER with pci=nomsi
  ...

Fixed up trivial conflicts in MAINTAINERS

diff --combined MAINTAINERS
index 0c138ba86526907a141ca2e94631bb68ab390c5b,5cbe07cf4ea11352dfe1735bc5bbf05a99ab0d82..e797c4d48cf10775a680abf5577eb28fae66e842
--- 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>
@@@ -257,12 -256,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
@@@ -498,7 -491,7 +492,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 -502,36 +503,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 -548,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.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 -575,14 +576,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 -600,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.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 -614,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.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,62 -644,55 +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.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 IXP4XX ARM ARCHITECTURE
 +M:    Imre Kaloz <kaloz@openwrt.org>
 +M:    Krzysztof Halasa <khc@pm.waw.pl>
 +L:    linux-arm-kernel@lists.infradead.org
 +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.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
@@@ -716,7 -702,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.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/
@@@ -727,7 -713,7 +721,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
  
@@@ -768,18 -754,18 +762,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
@@@ -798,7 -784,7 +792,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/
@@@ -806,65 -792,65 +800,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/
@@@ -902,13 -888,6 +896,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
@@@ -946,12 -925,6 +940,12 @@@ W:       http://wireless.kernel.org/en/users/
  S:    Maintained
  F:    drivers/net/wireless/ath/ar9170/
  
 +ATK0110 HWMON DRIVER
 +M:    Luca Tettamanti <kronos.it@gmail.com>
 +L:    lm-sensors@lm-sensors.org
 +S:    Maintained
 +F:    drivers/hwmon/asus_atk0110.c
 +
  ATI_REMOTE2 DRIVER
  M:    Ville Syrjala <syrjala@sci.fi>
  S:    Maintained
@@@ -978,7 -951,7 +972,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
@@@ -1556,7 -1529,7 +1550,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.*
@@@ -1988,6 -1961,7 +1982,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
@@@ -2100,7 -2074,7 +2094,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
@@@ -2121,12 -2095,12 +2115,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>
@@@ -2172,16 -2146,13 +2166,16 @@@ F:   Documentation/filesystems/caching
  F:    fs/fscache/
  F:    include/linux/fscache*.h
  
 -FTRACE
 +TRACING
  M:    Steven Rostedt <rostedt@goodmis.org>
 +M:    Frederic Weisbecker <fweisbec@gmail.com>
 +M:    Ingo Molnar <mingo@redhat.com>
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git tracing/core
  S:    Maintained
  F:    Documentation/trace/ftrace.txt
  F:    arch/*/*/*/ftrace.h
  F:    arch/*/kernel/ftrace.c
 -F:    include/*/ftrace.h
 +F:    include/*/ftrace.h include/trace/ include/linux/trace*.h
  F:    kernel/trace/
  
  FUJITSU FR-V (FRV) PORT
@@@ -2331,9 -2302,7 +2325,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
@@@ -2820,8 -2789,6 +2814,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
@@@ -2919,8 -2886,8 +2913,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*/
@@@ -2974,7 -2941,7 +2968,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>
@@@ -3468,7 -3435,7 +3462,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.*
  
@@@ -3543,6 -3510,7 +3537,6 @@@ F:      drivers/net/natsemi.
  
  NCP FILESYSTEM
  M:    Petr Vandrovec <vandrove@vc.cvut.cz>
 -L:    linware@sh.cvut.cz
  S:    Maintained
  F:    fs/ncpfs/
  
@@@ -3752,7 -3720,7 +3746,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>
@@@ -3784,13 -3752,7 +3778,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>
@@@ -3980,15 -3942,6 +3974,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
@@@ -4005,11 -3958,11 +3999,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
@@@ -4033,7 -3986,7 +4027,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>
@@@ -4058,7 -4011,8 +4052,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
@@@ -4200,7 -4154,7 +4194,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*
@@@ -4213,13 -4167,13 +4207,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
  
@@@ -4460,7 -4414,7 +4454,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.*
  
@@@ -4486,14 -4440,6 +4480,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
@@@ -4565,20 -4511,20 +4559,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
  
@@@ -4664,7 -4610,7 +4658,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/
@@@ -4672,24 -4618,6 +4666,17 @@@ 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
- 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>
@@@ -4705,12 -4633,6 +4692,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
@@@ -5090,11 -5012,6 +5077,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
@@@ -5687,12 -5604,6 +5674,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
@@@ -5712,7 -5623,8 +5699,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
@@@ -5745,26 -5657,6 +5732,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
@@@ -5797,7 -5689,7 +5784,7 @@@ F:      include/xen
  
  XFS FILESYSTEM
  P:    Silicon Graphics Inc
 -M:    Felix Blyakher <felixb@sgi.com>
 +M:    Alex Elder <aelder@sgi.com>
  M:    xfs-masters@oss.sgi.com
  L:    xfs@oss.sgi.com
  W:    http://oss.sgi.com/projects/xfs

diff --combined include/linux/vgaarb.h
index 923f9040ea203568649e18faa245c1adf83f2dd8,a1fa1da8dc1a7257d7e8c1d44f6f14094036bc25..2dfaa293ae8c971303092235da547b5afb438319
--- 1/include/linux/vgaarb.h
--- 2/include/linux/vgaarb.h
+++ b/include/linux/vgaarb.h
@@@ -1,5 -1,6 +1,6 @@@
  /*
-  * vgaarb.c
+  * The VGA aribiter manages VGA space routing and VGA resource decode to
+  * allow multiple VGA devices to be used in a system in a safe way.
   *
   * (C) Copyright 2005 Benjamin Herrenschmidt <benh@kernel.crashing.org>
   * (C) Copyright 2007 Paulo R. Zanoni <przanoni@gmail.com>
@@@ -41,7 -42,7 +42,7 @@@
   *     interrupts at any time.
   */
  extern void vga_set_legacy_decoding(struct pci_dev *pdev,
 -                                                                      unsigned int decodes);
 +                                  unsigned int decodes);
  
  /**
   *     vga_get         - acquire & locks VGA resources
@@@ -193,17 -194,8 +194,17 @@@ static inline int vga_conflicts(struct 
   * They driver will get a callback when VGA arbitration is first used
   * by userspace since we some older X servers have issues.
   */
 +#if defined(CONFIG_VGA_ARB)
  int vga_client_register(struct pci_dev *pdev, void *cookie,
                        void (*irq_set_state)(void *cookie, bool state),
                        unsigned int (*set_vga_decode)(void *cookie, bool state));
 +#else
 +static inline int vga_client_register(struct pci_dev *pdev, void *cookie,
 +                                    void (*irq_set_state)(void *cookie, bool state),
 +                                    unsigned int (*set_vga_decode)(void *cookie, bool state))
 +{
 +      return 0;
 +}
 +#endif
  
  #endif /* LINUX_VGA_H */