Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/xscaleiop

Conflicts:
	MAINTAINERS

diff --combined MAINTAINERS
index c450f3abb8c9b5f1fb037b4788665419c0e1238b,e2f7199c532f3051e3e7e53fe6059a5c1f4fdd89..e7047c3743a8578e778c3fd66de3e1476b795d81
--- 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 <[email protected]>
@@@ -257,6 -256,12 +257,6 @@@ W:        http://www.lesswatts.org/projects/ac
  S:    Supported
  F:    drivers/acpi/fan.c
  
 -ACPI PCI HOTPLUG DRIVER
 -M:    Kristen Carlson Accardi <[email protected]>
 -L:    [email protected]
 -S:    Supported
 -F:    drivers/pci/hotplug/acpi*
 -
  ACPI THERMAL DRIVER
  M:    Zhang Rui <[email protected]>
  L:    [email protected]
@@@ -434,7 -439,7 +434,7 @@@ F: drivers/hwmon/ams
  AMSO1100 RNIC DRIVER
  M:    Tom Tucker <[email protected]>
  M:    Steve Wise <[email protected]>
 -L:    [email protected].org
 +L:    [email protected].org
  S:    Maintained
  F:    drivers/infiniband/hw/amso1100/
  
@@@ -492,7 -497,7 +492,7 @@@ F: arch/arm/include/asm/floppy.
  
  ARM PORT
  M:    Russell King <[email protected]>
 -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/
@@@ -503,71 -508,51 +503,71 @@@ F:      drivers/mmc/host/mmci.
  
  ARM/ADI ROADRUNNER MACHINE SUPPORT
  M:    Lennert Buytenhek <[email protected]>
 -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 <[email protected]>
 -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 <[email protected]>
 -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 <[email protected]>
 -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 <[email protected]>
 -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 <[email protected]>
 +M:    Scott Branden <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +S:    Maintained
 +F:    arch/arm/mach-bcmring
 +
 +ARM/BCMRING MTD NAND DRIVER
 +M:    Leo Chen <[email protected]>
 +M:    Scott Branden <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/mtd/nand/bcm_umi_nand.c
 +F:    drivers/mtd/nand/bcm_umi_bch.c
 +F:    drivers/mtd/nand/bcm_umi_hamming.c
 +F:    drivers/mtd/nand/nand_bcm_umi.h
 +
  ARM/CIRRUS LOGIC EP93XX ARM ARCHITECTURE
 -M:    Lennert Buytenhek <[email protected]>
 -L:    [email protected] (subscribers-only)
 +M:    Hartley Sweeten <[email protected]>
 +M:    Ryan Mallon <[email protected]>
 +L:    [email protected] (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 <[email protected]>
 -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 <[email protected]>
 -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 <[email protected]>
 -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
@@@ -576,14 -561,14 +576,14 @@@ S:      Maintaine
  
  ARM/CORTINA SYSTEMS GEMINI ARM ARCHITECTURE
  M:    Paulius Zaleckas <[email protected]>
 -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 <[email protected]>
 -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/
@@@ -601,13 -586,13 +601,13 @@@ F:      arch/arm/mach-pxa/ezx.
  
  ARM/FARADAY FA526 PORT
  M:    Paulius Zaleckas <[email protected]>
 -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 <[email protected]>
 -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
@@@ -615,17 -600,17 +615,17 @@@ F:      arch/arm/mach-footbridge
  
  ARM/FREESCALE IMX / MXC ARM ARCHITECTURE
  M:    Sascha Hauer <[email protected]>
 -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 <[email protected]>
 -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 <[email protected]>
 -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
@@@ -645,83 -630,64 +645,83 @@@ F:      arch/arm/mach-sa1100/include/mach/jo
  ARM/INTEL IOP32X ARM ARCHITECTURE
  M:    Lennert Buytenhek <[email protected]>
  M:    Dan Williams <[email protected]>
 -L:    linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
- S:    Supported
+ S:    Maintained
  
  ARM/INTEL IOP33X ARM ARCHITECTURE
  M:    Dan Williams <[email protected]>
 -L:    linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
- S:    Supported
+ S:    Maintained
  
  ARM/INTEL IOP13XX ARM ARCHITECTURE
  M:    Lennert Buytenhek <[email protected]>
  M:    Dan Williams <[email protected]>
 -L:    linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
- S:    Supported
+ S:    Maintained
  
  ARM/INTEL IQ81342EX MACHINE SUPPORT
  M:    Lennert Buytenhek <[email protected]>
  M:    Dan Williams <[email protected]>
 -L:    linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
- S:    Supported
+ S:    Maintained
  
  ARM/INTEL IXP2000 ARM ARCHITECTURE
  M:    Lennert Buytenhek <[email protected]>
 -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 <[email protected]>
 -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 <[email protected]>
 -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 <[email protected]>
 +M:    Krzysztof Halasa <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +S:    Maintained
 +F:    arch/arm/mach-ixp4xx/
 +
  ARM/INTEL XSC3 (MANZANO) ARM CORE
  M:    Lennert Buytenhek <[email protected]>
  M:    Dan Williams <[email protected]>
 -L:    linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
- S:    Supported
+ S:    Maintained
  
  ARM/IP FABRICS DOUBLE ESPRESSO MACHINE SUPPORT
  M:    Lennert Buytenhek <[email protected]>
 -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 <[email protected]>
 -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
  M:    Philipp Zabel <[email protected]>
  S:    Maintained
  
 +ARM/Marvell Loki/Kirkwood/MV78xx0/Orion SOC support
 +M:    Lennert Buytenhek <[email protected]>
 +M:    Nicolas Pitre <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +T:    git git://git.marvell.com/orion
 +S:    Maintained
 +F:    arch/arm/mach-loki/
 +F:    arch/arm/mach-kirkwood/
 +F:    arch/arm/mach-mv78xx0/
 +F:    arch/arm/mach-orion5x/
 +F:    arch/arm/plat-orion/
 +
  ARM/MIOA701 MACHINE SUPPORT
  M:    Robert Jarzmik <[email protected]>
 -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
  
@@@ -740,22 -706,18 +740,22 @@@ M:      Dmitry Eremin-Solenikov <dbaryshkov@
  M:    Dirk Opfer <[email protected]>
  S:    Maintained
  
 -ARM/PALMTX,PALMT5,PALMLD,PALMTE2 SUPPORT
 -M:    Marek Vasut <[email protected]>
 +ARM/PALMTX,PALMT5,PALMLD,PALMTE2,PALMTC SUPPORT
 +P:    Marek Vasut
 +M:    [email protected]
 +L:    [email protected]
  W:    http://hackndev.com
  S:    Maintained
  
  ARM/PALM TREO 680 SUPPORT
  M:    Tomas Cech <[email protected]>
 +L:    [email protected]
  W:    http://hackndev.com
  S:    Maintained
  
  ARM/PALMZ72 SUPPORT
  M:    Sergey Lapin <[email protected]>
 +L:    [email protected]
  W:    http://hackndev.com
  S:    Maintained
  
@@@ -766,18 -728,18 +766,18 @@@ S:      Maintaine
  
  ARM/PT DIGITAL BOARD PORT
  M:    Stefan Eletzhofer <[email protected]>
 -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 <[email protected]>
 -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 <[email protected]>
 -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
@@@ -796,7 -758,7 +796,7 @@@ S: Maintaine
  
  ARM/SAMSUNG ARM ARCHITECTURES
  M:    Ben Dooks <[email protected]>
 -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/
@@@ -804,65 -766,65 +804,65 @@@ F:      arch/arm/plat-s3c24xx
  
  ARM/S3C2410 ARM ARCHITECTURE
  M:    Ben Dooks <[email protected]>
 -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 <[email protected]>
 -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 <[email protected]>
 -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 <[email protected]>
 -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 <[email protected]>
 -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 <[email protected]>
 -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 <[email protected]>
 -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 <[email protected]>
 -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 <[email protected]>
 -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 <[email protected]>
 -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/
@@@ -900,13 -862,6 +900,13 @@@ F:       drivers/dma
  F:    include/linux/dmaengine.h
  F:    include/linux/async_tx.h
  
 +AT24 EEPROM DRIVER
 +M:    Wolfram Sang <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/misc/eeprom/at24.c
 +F:    include/linux/i2c/at24.h
 +
  ATA OVER ETHERNET (AOE) DRIVER
  M:    "Ed L. Cashin" <[email protected]>
  W:    http://www.coraid.com/support/linux
@@@ -921,7 -876,6 +921,7 @@@ M: "Luis R. Rodriguez" <lrodriguez@athe
  M:    Bob Copeland <[email protected]>
  L:    [email protected]
  L:    [email protected]
 +W:    http://wireless.kernel.org/en/users/Drivers/ath5k
  S:    Maintained
  F:    drivers/net/wireless/ath/ath5k/
  
@@@ -933,7 -887,6 +933,7 @@@ M: Vasanthakumar Thiagarajan <vasanth@a
  M:    Senthil Balasubramanian <[email protected]>
  L:    [email protected]
  L:    [email protected]
 +W:    http://wireless.kernel.org/en/users/Drivers/ath9k
  S:    Supported
  F:    drivers/net/wireless/ath/ath9k/
  
@@@ -944,12 -897,6 +944,12 @@@ W:       http://wireless.kernel.org/en/users/
  S:    Maintained
  F:    drivers/net/wireless/ath/ar9170/
  
 +ATK0110 HWMON DRIVER
 +M:    Luca Tettamanti <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/hwmon/asus_atk0110.c
 +
  ATI_REMOTE2 DRIVER
  M:    Ville Syrjala <[email protected]>
  S:    Maintained
@@@ -957,7 -904,7 +957,7 @@@ F: drivers/input/misc/ati_remote2.
  
  ATLX ETHERNET DRIVERS
  M:    Jay Cliburn <[email protected]>
 -M:    Chris Snook <csnook@redhat.com>
 +M:    Chris Snook <chris.snook@gmail.com>
  M:    Jie Yang <[email protected]>
  L:    [email protected]
  W:    http://sourceforge.net/projects/atl1
@@@ -976,7 -923,7 +976,7 @@@ F: include/linux/atm
  
  ATMEL AT91 MCI DRIVER
  M:    Nicolas Ferre <[email protected]>
 -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
@@@ -1547,14 -1494,14 +1547,14 @@@ F:   drivers/net/cxgb3
  
  CXGB3 IWARP RNIC DRIVER (IW_CXGB3)
  M:    Steve Wise <[email protected]>
 -L:    [email protected].org
 +L:    [email protected].org
  W:    http://www.openfabrics.org
  S:    Supported
  F:    drivers/infiniband/hw/cxgb3/
  
  CYBERPRO FB DRIVER
  M:    Russell King <[email protected]>
 -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.*
@@@ -1921,7 -1868,7 +1921,7 @@@ F:      fs/efs
  EHCA (IBM GX bus InfiniBand adapter) DRIVER
  M:    Hoang-Nam Nguyen <[email protected]>
  M:    Christoph Raisch <[email protected]>
 -L:    [email protected].org
 +L:    [email protected].org
  S:    Supported
  F:    drivers/infiniband/hw/ehca/
  
@@@ -1986,6 -1933,7 +1986,6 @@@ F:      fs/ext2
  F:    include/linux/ext2*
  
  EXT3 FILE SYSTEM
 -M:    Stephen Tweedie <[email protected]>
  M:    Andrew Morton <[email protected]>
  M:    Andreas Dilger <[email protected]>
  L:    [email protected]
@@@ -2098,7 -2046,7 +2098,7 @@@ F:      drivers/i2c/busses/i2c-cpm.
  FREESCALE IMX / MXC FRAMEBUFFER DRIVER
  M:    Sascha Hauer <[email protected]>
  L:    [email protected] (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
@@@ -2119,12 -2067,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 <[email protected]>
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
 -F:    drivers/usb/gadget/fsl_usb2_udc.c
 +F:    drivers/usb/gadget/fsl*
  
  FREESCALE QUICC ENGINE UCC ETHERNET DRIVER
  M:    Li Yang <[email protected]>
@@@ -2170,16 -2118,13 +2170,16 @@@ F:   Documentation/filesystems/caching
  F:    fs/fscache/
  F:    include/linux/fscache*.h
  
 -FTRACE
 +TRACING
  M:    Steven Rostedt <[email protected]>
 +M:    Frederic Weisbecker <[email protected]>
 +M:    Ingo Molnar <[email protected]>
 +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
@@@ -2239,13 -2184,6 +2239,13 @@@ T:    git git://git.kernel.org/pub/scm/lin
  S:    Maintained
  F:    include/asm-generic
  
 +GENERIC UIO DRIVER FOR PCI DEVICES
 +M:    Michael S. Tsirkin <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/uio/uio_pci_generic.c
 +
  GFS2 FILE SYSTEM
  M:    Steven Whitehouse <[email protected]>
  L:    [email protected]
@@@ -2301,7 -2239,8 +2301,7 @@@ S:      Maintaine
  F:    drivers/media/video/gspca/pac207.c
  
  GSPCA SN9C20X SUBDRIVER
 -P:    Brian Johnson
 -M:    [email protected]
 +M:    Brian Johnson <[email protected]>
  L:    [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
  S:    Maintained
@@@ -2329,9 -2268,7 +2329,9 @@@ S:      Orpha
  F:    drivers/hwmon/
  
  HARDWARE RANDOM NUMBER GENERATOR CORE
 -S:    Orphan
 +M:    Matt Mackall <[email protected]>
 +M:    Herbert Xu <[email protected]>
 +S:    Odd fixes
  F:    Documentation/hw_random.txt
  F:    drivers/char/hw_random/
  F:    include/linux/hw_random.h
@@@ -2616,7 -2553,7 +2616,7 @@@ INFINIBAND SUBSYSTE
  M:    Roland Dreier <[email protected]>
  M:    Sean Hefty <[email protected]>
  M:    Hal Rosenstock <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 +L:    [email protected]
  W:    http://www.openib.org/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband.git
  S:    Supported
@@@ -2682,7 -2619,7 +2682,7 @@@ F:      include/linux/intel-iommu.
  
  INTEL IOP-ADMA DMA DRIVER
  M:    Dan Williams <[email protected]>
- S:    Supported
+ S:    Maintained
  F:    drivers/dma/iop-adma.c
  
  INTEL IXP4XX QMGR, NPE, ETHERNET and HSS SUPPORT
@@@ -2724,21 -2661,25 +2724,21 @@@ F:   drivers/net/ixgbe
  
  INTEL PRO/WIRELESS 2100 NETWORK CONNECTION SUPPORT
  M:    Zhu Yi <[email protected]>
 -M:    James Ketrenos <[email protected]>
  M:    Reinette Chatre <[email protected]>
 +M:    Intel Linux Wireless <[email protected]>
  L:    [email protected]
 -L:    [email protected]
 -W:    http://lists.sourceforge.net/mailman/listinfo/ipw2100-devel
  W:    http://ipw2100.sourceforge.net
 -S:    Supported
 +S:    Odd Fixes
  F:    Documentation/networking/README.ipw2100
  F:    drivers/net/wireless/ipw2x00/ipw2100.*
  
  INTEL PRO/WIRELESS 2915ABG NETWORK CONNECTION SUPPORT
  M:    Zhu Yi <[email protected]>
 -M:    James Ketrenos <[email protected]>
  M:    Reinette Chatre <[email protected]>
 +M:    Intel Linux Wireless <[email protected]>
  L:    [email protected]
 -L:    [email protected]
 -W:    http://lists.sourceforge.net/mailman/listinfo/ipw2100-devel
  W:    http://ipw2200.sourceforge.net
 -S:    Supported
 +S:    Odd Fixes
  F:    Documentation/networking/README.ipw2200
  F:    drivers/net/wireless/ipw2x00/ipw2200.*
  
@@@ -2755,8 -2696,8 +2755,8 @@@ F:      include/linux/wimax/i2400m.
  INTEL WIRELESS WIFI LINK (iwlwifi)
  M:    Zhu Yi <[email protected]>
  M:    Reinette Chatre <[email protected]>
 +M:    Intel Linux Wireless <[email protected]>
  L:    [email protected]
 -L:    [email protected]
  W:    http://intellinuxwireless.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-2.6.git
  S:    Supported
@@@ -2789,7 -2730,7 +2789,7 @@@ F:      drivers/net/ipg.
  
  IPATH DRIVER
  M:    Ralph Campbell <[email protected]>
 -L:    [email protected].org
 +L:    [email protected].org
  T:    git git://git.qlogic.com/ipath-linux-2.6
  S:    Supported
  F:    drivers/infiniband/hw/ipath/
@@@ -2818,8 -2759,6 +2818,8 @@@ L:      [email protected]
  L:    [email protected]
  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
@@@ -2917,8 -2856,8 +2917,8 @@@ F:      fs/jffs2
  F:    include/linux/jffs2.h
  
  JOURNALLING LAYER FOR BLOCK DEVICES (JBD)
 -M:    Stephen Tweedie <[email protected]>
  M:    Andrew Morton <[email protected]>
 +M:    Jan Kara <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    fs/jbd*/
@@@ -2972,7 -2911,7 +2972,7 @@@ F:      scripts/Makefile.
  KERNEL JANITORS
  L:    [email protected]
  W:    http://www.kerneljanitors.org/
 -S:    Odd fixes
 +S:    Maintained
  
  KERNEL NFSD, SUNRPC, AND LOCKD SERVERS
  M:    "J. Bruce Fields" <[email protected]>
@@@ -2990,7 -2929,6 +2990,7 @@@ F:      include/linux/sunrpc
  
  KERNEL VIRTUAL MACHINE (KVM)
  M:    Avi Kivity <[email protected]>
 +M:    Marcelo Tosatti <[email protected]>
  L:    [email protected]
  W:    http://kvm.qumranet.com
  S:    Supported
@@@ -3342,14 -3280,8 +3342,14 @@@ S:    Supporte
  F:    drivers/net/mv643xx_eth.*
  F:    include/linux/mv643xx.h
  
 +MARVELL MWL8K WIRELESS DRIVER
 +M:    Lennert Buytenhek <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/net/wireless/mwl8k.c
 +
  MARVELL SOC MMC/SD/SDIO CONTROLLER DRIVER
 -M:    Nicolas Pitre <nico@cam.org>
 +M:    Nicolas Pitre <nico@fluxnic.net>
  S:    Maintained
  
  MARVELL YUKON / SYSKONNECT DRIVER
@@@ -3466,7 -3398,7 +3466,7 @@@ F:      include/linux/meye.
  
  MOTOROLA IMX MMC/SD HOST CONTROLLER INTERFACE DRIVER
  M:    Pavel Pisa <[email protected]>
 -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.*
  
@@@ -3497,7 -3429,6 +3497,7 @@@ F:      drivers/mfd
  
  MULTIMEDIA CARD (MMC), SECURE DIGITAL (SD) AND SDIO SUBSYSTEM
  S:    Orphan
 +L:    [email protected]
  F:    drivers/mmc/
  F:    include/linux/mmc/
  
@@@ -3541,6 -3472,7 +3541,6 @@@ F:      drivers/net/natsemi.
  
  NCP FILESYSTEM
  M:    Petr Vandrovec <[email protected]>
 -L:    [email protected]
  S:    Maintained
  F:    fs/ncpfs/
  
@@@ -3553,7 -3485,7 +3553,7 @@@ F:      drivers/scsi/NCR_D700.
  NETEFFECT IWARP RNIC DRIVER (IW_NES)
  M:    Faisal Latif <[email protected]>
  M:    Chien Tung <[email protected]>
 -L:    [email protected].org
 +L:    [email protected].org
  W:    http://www.neteffect.com
  S:    Supported
  F:    drivers/infiniband/hw/nes/
@@@ -3631,9 -3563,6 +3631,9 @@@ T:      git git://git.kernel.org/pub/scm/lin
  S:    Maintained
  F:    net/
  F:    include/net/
 +F:    include/linux/in.h
 +F:    include/linux/net.h
 +F:    include/linux/netdevice.h
  
  NETWORKING [IPv4/IPv6]
  M:    "David S. Miller" <[email protected]>
@@@ -3659,12 -3588,9 +3659,12 @@@ M:    "John W. Linville" <linville@tuxdriv
  L:    [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git
  S:    Maintained
 +F:    net/mac80211/
 +F:    net/rfkill/
  F:    net/wireless/
  F:    include/net/ieee80211*
  F:    include/linux/wireless.h
 +F:    drivers/net/wireless/
  
  NETWORKING DRIVERS
  L:    [email protected]
@@@ -3672,8 -3598,6 +3672,8 @@@ W:      http://www.linuxfoundation.org/en/Ne
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.git
  S:    Odd Fixes
  F:    drivers/net/
 +F:    include/linux/if_*
 +F:    include/linux/*device.h
  
  NETXEN (1/10) GbE SUPPORT
  M:    Dhananjay Phadke <[email protected]>
@@@ -3750,7 -3674,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 <[email protected]>
@@@ -3782,13 -3706,7 +3782,13 @@@ OMAP MMC SUPPOR
  M:    Jarkko Lavinen <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    drivers/mmc/host/*omap*
 +F:    drivers/mmc/host/omap.c
 +
 +OMAP HS MMC SUPPORT
 +M:    Madhusudhan Chikkature <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/mmc/host/omap_hsmmc.c
  
  OMAP RANDOM NUMBER GENERATOR SUPPORT
  M:    Deepak Saxena <[email protected]>
@@@ -3886,7 -3804,7 +3886,7 @@@ W:      http://open-osd.or
  T:    git git://git.open-osd.org/open-osd.git
  S:    Maintained
  F:    drivers/scsi/osd/
 -F:    drivers/include/scsi/osd_*
 +F:    include/scsi/osd_*
  F:    fs/exofs/
  
  P54 WIRELESS DRIVER
@@@ -3978,15 -3896,6 +3978,15 @@@ S:    Maintaine
  F:    drivers/leds/leds-pca9532.c
  F:    include/linux/leds-pca9532.h
  
 +PCA9564/PCA9665 I2C BUS DRIVER
 +M:    Wolfram Sang <[email protected]>
 +L:    [email protected]
 +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 <[email protected]>
  L:    [email protected]
@@@ -4003,11 -3912,11 +4003,11 @@@ F:   Documentation/PCI
  F:    drivers/pci/
  F:    include/linux/pci*
  
 -PCIE HOTPLUG DRIVER
 -M:    Kristen Carlson Accardi <[email protected]>
 +PCI HOTPLUG
 +M:    Jesse Barnes <[email protected]>
  L:    [email protected]
  S:    Supported
 -F:    drivers/pci/pcie/
 +F:    drivers/pci/hotplug
  
  PCMCIA SUBSYSTEM
  P:    Linux PCMCIA Team
@@@ -4031,7 -3940,7 +4031,7 @@@ S:      Maintaine
  F:    include/linux/delayacct.h
  F:    kernel/delayacct.c
  
 -PERFORMANCE COUNTER SUBSYSTEM
 +PERFORMANCE EVENTS SUBSYSTEM
  M:    Peter Zijlstra <[email protected]>
  M:    Paul Mackerras <[email protected]>
  M:    Ingo Molnar <[email protected]>
@@@ -4055,13 -3964,6 +4055,13 @@@ S:    Maintaine
  F:    drivers/block/pktcdvd.c
  F:    include/linux/pktcdvd.h
  
 +PMC SIERRA MaxRAID DRIVER
 +M:    Anil Ravindranath <[email protected]>
 +L:    [email protected]
 +W:    http://www.pmc-sierra.com/
 +S:    Supported
 +F:    drivers/scsi/pmcraid.*
 +
  POSIX CLOCKS and TIMERS
  M:    Thomas Gleixner <[email protected]>
  S:    Supported
@@@ -4198,7 -4100,7 +4198,7 @@@ F:      drivers/media/video/pvrusb2
  PXA2xx/PXA3xx SUPPORT
  M:    Eric Miao <[email protected]>
  M:    Russell King <[email protected]>
 -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*
@@@ -4211,13 -4113,13 +4211,13 @@@ F:   sound/soc/px
  PXA168 SUPPORT
  M:    Eric Miao <[email protected]>
  M:    Jason Chagas <[email protected]>
 -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 <[email protected]>
 -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
  
@@@ -4392,7 -4294,7 +4392,7 @@@ L:      [email protected]
  W:    http://linuxwireless.org/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git
  S:    Maintained
 -F:    drivers/net/wireless/rtl818*
 +F:    drivers/net/wireless/rtl818x/rtl8180*
  
  RTL8187 WIRELESS DRIVER
  M:    Herton Ronaldo Krzesinski <[email protected]>
@@@ -4458,7 -4360,7 +4458,7 @@@ F:      net/iucv
  
  S3C24XX SD/MMC Driver
  M:    Ben Dooks <[email protected]>
 -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.*
  
@@@ -4484,14 -4386,6 +4484,14 @@@ S:    Maintaine
  F:    kernel/sched*
  F:    include/linux/sched.h
  
 +SCORE ARCHITECTURE
 +P:    Chen Liqin
 +M:    [email protected]
 +P:    Lennox Wu
 +M:    [email protected]
 +W:    http://www.sunplusct.com
 +S:    Supported
 +
  SCSI CDROM DRIVER
  M:    Jens Axboe <[email protected]>
  L:    [email protected]
@@@ -4508,7 -4402,7 +4508,7 @@@ F:      drivers/scsi/sg.
  F:    include/scsi/sg.h
  
  SCSI SUBSYSTEM
 -M:    "James E.J. Bottomley" <James.Bottomley@HansenPartnership.com>
 +M:    "James E.J. Bottomley" <James.Bottomley@suse.de>
  L:    [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6.git
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6.git
@@@ -4563,20 -4457,20 +4563,20 @@@ S:   Maintaine
  F:    drivers/mmc/host/sdricoh_cs.c
  
  SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) DRIVER
 -M:    Pierre Ossman <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 +S:     Orphan
 +L:     [email protected]
 +F:     drivers/mmc/host/sdhci.*
  
  SECURE DIGITAL HOST CONTROLLER INTERFACE, OPEN FIRMWARE BINDINGS (SDHCI-OF)
  M:    Anton Vorontsov <[email protected]>
  L:    [email protected]
 -L:    [email protected]
 +L:     [email protected]
  S:    Maintained
 -F:    drivers/mmc/host/sdhci.*
 +F:     drivers/mmc/host/sdhci-of.*
  
  SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) SAMSUNG DRIVER
  M:    Ben Dooks <[email protected]>
 -L:    [email protected]
 +L:     [email protected]
  S:    Maintained
  F:    drivers/mmc/host/sdhci-s3c.c
  
@@@ -4627,10 -4521,9 +4627,10 @@@ S:    Supporte
  F:    drivers/net/benet/
  
  SFC NETWORK DRIVER
 -P:    Steve Hodgson
 -P:    Ben Hutchings
 -M:    Robert Stonehouse <[email protected]>
 +M:    Solarflare linux maintainers <[email protected]>
 +M:    Steve Hodgson <[email protected]>
 +M:    Ben Hutchings <[email protected]>
 +L:    [email protected]
  S:    Supported
  F:    drivers/net/sfc/
  
@@@ -4662,7 -4555,7 +4662,7 @@@ F:      drivers/misc/sgi-xp
  SHARP LH SUPPORT (LH7952X & LH7A40X)
  M:    Marc Singer <[email protected]>
  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/
@@@ -4670,16 -4563,11 +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 <[email protected]>
 -L:    [email protected]
 +SIMPLE FIRMWARE INTERFACE (SFI)
 +P:    Len Brown
 +M:    [email protected]
 +L:    [email protected]
 +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
@@@ -4696,12 -4584,6 +4696,12 @@@ F:    arch/arm/mach-s3c2410
  F:    drivers/*/*s3c2410*
  F:    drivers/*/*/*s3c2410*
  
 +TI DAVINCI MACHINE SUPPORT
 +P:    Kevin Hilman
 +M:    [email protected]
 +S:    Supported
 +F:    arch/arm/mach-davinci
 +
  SIS 190 ETHERNET DRIVER
  M:    Francois Romieu <[email protected]>
  L:    [email protected]
@@@ -4753,7 -4635,7 +4753,7 @@@ F:      include/linux/sl?b*.
  F:    mm/sl?b.c
  
  SMC91x ETHERNET DRIVER
 -M:    Nicolas Pitre <nico@cam.org>
 +M:    Nicolas Pitre <nico@fluxnic.net>
  S:    Maintained
  F:    drivers/net/smc91x.*
  
@@@ -5081,11 -4963,6 +5081,11 @@@ T:    quilt http://svn.sourceforge.jp/svnr
  S:    Maintained
  F:    security/tomoyo/
  
 +TOPSTAR LAPTOP EXTRAS DRIVER
 +M:    Herton Ronaldo Krzesinski <[email protected]>
 +S:    Maintained
 +F:    drivers/platform/x86/topstar-laptop.c
 +
  TOSHIBA ACPI EXTRAS DRIVER
  S:    Orphan
  F:    drivers/platform/x86/toshiba_acpi.c
@@@ -5678,12 -5555,6 +5678,12 @@@ L:    [email protected]
  S:    Maintained
  F:    drivers/scsi/wd7000.c
  
 +WINBOND CIR DRIVER
 +P:    David Härdeman
 +M:    [email protected]
 +S:    Maintained
 +F:    drivers/input/misc/winbond-cir.c
 +
  WIMAX STACK
  M:    Inaky Perez-Gonzalez <[email protected]>
  M:    [email protected]
@@@ -5702,23 -5573,6 +5702,23 @@@ M:    Miloslav Trmac <[email protected]
  S:    Maintained
  F:    drivers/input/misc/wistron_btns.c
  
 +WL1251 WIRELESS DRIVER
 +M:    Kalle Valo <[email protected]>
 +L:    [email protected]
 +W:    http://wireless.kernel.org
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git
 +S:    Maintained
 +F:    drivers/net/wireless/wl12xx/*
 +X:    drivers/net/wireless/wl12xx/wl1271*
 +
 +WL1271 WIRELESS DRIVER
 +M:    Luciano Coelho <[email protected]>
 +L:    [email protected]
 +W:    http://wireless.kernel.org
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git
 +S:    Maintained
 +F:    drivers/net/wireless/wl12xx/wl1271*
 +
  WL3501 WIRELESS PCMCIA CARD DRIVER
  M:    Arnaldo Carvalho de Melo <[email protected]>
  L:    [email protected]
@@@ -5736,26 -5590,6 +5736,26 @@@ S:    Supporte
  F:    drivers/input/touchscreen/*wm97*
  F:    include/linux/wm97xx.h
  
 +WOLFSON MICROELECTRONICS PMIC DRIVERS
 +P:    Mark Brown
 +M:    [email protected]
 +L:    [email protected]
 +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 <[email protected]>
  L:    [email protected]
@@@ -5788,7 -5622,7 +5788,7 @@@ F:      include/xen
  
  XFS FILESYSTEM
  P:    Silicon Graphics Inc
 -M:    Felix Blyakher <felixb@sgi.com>
 +M:    Alex Elder <aelder@sgi.com>
  M:    [email protected]
  L:    [email protected]
  W:    http://oss.sgi.com/projects/xfs