ASoC: Avoid a redundant read in cs42l51_pdn_event

[linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 1dbbb278d21847b06103e52c440a37e5c68700c3..c802e5fa2d11b7bd0e8e1080b96fee5ba13e72b3 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -117,20 +117,20 @@ Maintainers List (try to look for most precise areas first)
 M:     Philip Blundell <[email protected]>
 L:     [email protected]
 S:     Maintained
-F:     drivers/net/3c505*
+F:     drivers/net/ethernet/i825xx/3c505*
 
 3C59X NETWORK DRIVER
 M:     Steffen Klassert <[email protected]>
 L:     [email protected]
 S:     Maintained
 F:     Documentation/networking/vortex.txt
-F:     drivers/net/3c59x.c
+F:     drivers/net/ethernet/3com/3c59x.c
 
 3CR990 NETWORK DRIVER
 M:     David Dillow <[email protected]>
 L:     [email protected]
 S:     Maintained
-F:     drivers/net/typhoon*
+F:     drivers/net/ethernet/3com/typhoon*
 
 3WARE SAS/SATA-RAID SCSI DRIVERS (3W-XXXX, 3W-9XXX, 3W-SAS)
 M:     Adam Radford <[email protected]>
@@ -156,7 +156,7 @@ M:  Realtek linux nic maintainers <[email protected]>
 M:     Francois Romieu <[email protected]>
 L:     [email protected]
 S:     Maintained
-F:     drivers/net/r8169.c
+F:     drivers/net/ethernet/realtek/r8169.c
 
 8250/16?50 (AND CLONE UARTS) SERIAL DRIVER
 M:     Greg Kroah-Hartman <[email protected]>
@@ -170,8 +170,7 @@ F:  include/linux/serial_8250.h
 8390 NETWORK DRIVERS [WD80x3/SMC-ELITE, SMC-ULTRA, NE2000, 3C503, etc.]
 L:     [email protected]
 S:     Orphan / Obsolete
-F:     drivers/net/*8390*
-F:     drivers/net/ax88796.c
+F:     drivers/net/ethernet/8390/
 
 9P FILE SYSTEM
 M:     Eric Van Hensbergen <[email protected]>
@@ -214,7 +213,7 @@ ACENIC DRIVER
 M:     Jes Sorensen <[email protected]>
 L:     [email protected]
 S:     Maintained
-F:     drivers/net/acenic*
+F:     drivers/net/ethernet/alteon/acenic*
 
 ACER ASPIRE ONE TEMPERATURE AND FAN DRIVER
 M:     Peter Feuerer <[email protected]>
@@ -317,6 +316,10 @@ W: http://wiki.analog.com/AD7879
 S:     Supported
 F:     drivers/input/touchscreen/ad7879.c
 
+ADDRESS SPACE LAYOUT RANDOMIZATION (ASLR)
+M:     Jiri Kosina <[email protected]>
+S:     Maintained
+
 ADM1025 HARDWARE MONITOR DRIVER
 M:     Jean Delvare <[email protected]>
 L:     [email protected]
@@ -689,6 +692,12 @@ F: drivers/mtd/nand/bcm_umi_nand.c
 F:     drivers/mtd/nand/bcm_umi_bch.c
 F:     drivers/mtd/nand/nand_bcm_umi.h
 
+ARM/CALXEDA HIGHBANK ARCHITECTURE
+M:     Rob Herring <[email protected]>
+L:     [email protected] (moderated for non-subscribers)
+S:     Maintained
+F:     arch/arm/mach-highbank/
+
 ARM/CAVIUM NETWORKS CNS3XXX MACHINE SUPPORT
 M:     Anton Vorontsov <[email protected]>
 S:     Maintained
@@ -747,7 +756,7 @@ L:  [email protected] (moderated for non-subscribers)
 W:     http://www.arm.linux.org.uk/
 S:     Maintained
 F:     arch/arm/mach-ebsa110/
-F:     drivers/net/arm/am79c961a.*
+F:     drivers/net/ethernet/amd/am79c961a.*
 
 ARM/EZX SMARTPHONES (A780, A910, A1200, E680, ROKR E2 and ROKR E6)
 M:     Daniel Ribeiro <[email protected]>
@@ -788,6 +797,13 @@ L: [email protected] (moderated for non-subscribers)
 S:     Maintained
 F:     arch/arm/mach-mx5/
 
+ARM/FREESCALE IMX6
+M:     Shawn Guo <[email protected]>
+L:     [email protected] (moderated for non-subscribers)
+S:     Maintained
+T:     git git://git.linaro.org/people/shawnguo/linux-2.6.git
+F:     arch/arm/mach-imx/*imx6*
+
 ARM/GLOMATION GESBC9312SX MACHINE SUPPORT
 M:     Lennert Buytenhek <[email protected]>
 L:     [email protected] (moderated for non-subscribers)
@@ -1016,7 +1032,9 @@ F:        arch/arm/include/asm/hardware/ioc.h
 F:     arch/arm/include/asm/hardware/iomd.h
 F:     arch/arm/include/asm/hardware/memc.h
 F:     arch/arm/mach-rpc/
-F:     drivers/net/arm/ether*
+F:     drivers/net/ethernet/8390/etherh.c
+F:     drivers/net/ethernet/i825xx/ether1*
+F:     drivers/net/ethernet/seeq/ether3*
 F:     drivers/scsi/arm/
 
 ARM/SHARK MACHINE SUPPORT
@@ -1085,6 +1103,24 @@ F:       arch/arm/plat-s5p/dev-fimc*
 F:     arch/arm/plat-samsung/include/plat/*fimc*
 F:     drivers/media/video/s5p-fimc/
 
+ARM/SAMSUNG S5P SERIES Multi Format Codec (MFC) SUPPORT
+M:     Kyungmin Park <[email protected]>
+M:     Kamil Debski <[email protected]>
+L:     [email protected]
+L:     [email protected]
+S:     Maintained
+F:     arch/arm/plat-s5p/dev-mfc.c
+F:     drivers/media/video/s5p-mfc/
+
+ARM/SAMSUNG S5P SERIES TV SUBSYSTEM SUPPORT
+M:     Kyungmin Park <[email protected]>
+M:     Tomasz Stanislawski <[email protected]>
+L:     [email protected]
+L:     [email protected]
+S:     Maintained
+F:     arch/arm/plat-s5p/dev-tv.c
+F:     drivers/media/video/s5p-tv/
+
 ARM/SHMOBILE ARM ARCHITECTURE
 M:     Paul Mundt <[email protected]>
 M:     Magnus Damm <[email protected]>
@@ -1128,7 +1164,7 @@ F:        arch/arm/mach-nuc93x/
 F:     drivers/input/keyboard/w90p910_keypad.c
 F:     drivers/input/touchscreen/w90p910_ts.c
 F:     drivers/watchdog/nuc900_wdt.c
-F:     drivers/net/arm/w90p910_ether.c
+F:     drivers/net/ethernet/nuvoton/w90p910_ether.c
 F:     drivers/mtd/nand/nuc900_nand.c
 F:     drivers/rtc/rtc-nuc900.c
 F:     drivers/spi/spi_nuc900.c
@@ -1231,7 +1267,7 @@ F:        Documentation/aoe/
 F:     drivers/block/aoe/
 
 ATHEROS ATH GENERIC UTILITIES
-M:     "Luis R. Rodriguez" <lrodriguez@atheros.com>
+M:     "Luis R. Rodriguez" <[email protected].com>
 L:     [email protected]
 S:     Supported
 F:     drivers/net/wireless/ath/*
@@ -1239,7 +1275,7 @@ F:        drivers/net/wireless/ath/*
 ATHEROS ATH5K WIRELESS DRIVER
 M:     Jiri Slaby <[email protected]>
 M:     Nick Kossifidis <[email protected]>
-M:     "Luis R. Rodriguez" <lrodriguez@atheros.com>
+M:     "Luis R. Rodriguez" <[email protected].com>
 M:     Bob Copeland <[email protected]>
 L:     [email protected]
 L:     [email protected]
@@ -1247,11 +1283,19 @@ W:      http://wireless.kernel.org/en/users/Drivers/ath5k
 S:     Maintained
 F:     drivers/net/wireless/ath/ath5k/
 
+ATHEROS ATH6KL WIRELESS DRIVER
+M:     Kalle Valo <[email protected]>
+L:     [email protected]
+W:     http://wireless.kernel.org/en/users/Drivers/ath6kl
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath6kl.git
+S:     Supported
+F:     drivers/net/wireless/ath/ath6kl/
+
 ATHEROS ATH9K WIRELESS DRIVER
-M:     "Luis R. Rodriguez" <lrodriguez@atheros.com>
-M:     Jouni Malinen <jmalinen@atheros.com>
-M:     Vasanthakumar Thiagarajan <vasanth@atheros.com>
-M:     Senthil Balasubramanian <senthilkumar@atheros.com>
+M:     "Luis R. Rodriguez" <[email protected].com>
+M:     Jouni Malinen <j[email protected].com>
+M:     Vasanthakumar Thiagarajan <v[email protected].com>
+M:     Senthil Balasubramanian <senthil[email protected].com>
 L:     [email protected]
 L:     [email protected]
 W:     http://wireless.kernel.org/en/users/Drivers/ath9k
@@ -1279,12 +1323,11 @@ F:      drivers/input/misc/ati_remote2.c
 ATLX ETHERNET DRIVERS
 M:     Jay Cliburn <[email protected]>
 M:     Chris Snook <[email protected]>
-M:     Jie Yang <[email protected]>
 L:     [email protected]
 W:     http://sourceforge.net/projects/atl1
 W:     http://atl1.sourceforge.net
 S:     Maintained
-F:     drivers/net/atlx/
+F:     drivers/net/ethernet/atheros/
 
 ATM
 M:     Chas Williams <[email protected]>
@@ -1324,7 +1367,7 @@ F:        include/video/atmel_lcdc.h
 ATMEL MACB ETHERNET DRIVER
 M:     Nicolas Ferre <[email protected]>
 S:     Supported
-F:     drivers/net/macb.*
+F:     drivers/net/ethernet/cadence/
 
 ATMEL SPI DRIVER
 M:     Nicolas Ferre <[email protected]>
@@ -1447,7 +1490,7 @@ BLACKFIN EMAC DRIVER
 L:     [email protected]
 W:     http://blackfin.uclinux.org
 S:     Supported
-F:     drivers/net/bfin_mac.*
+F:     drivers/net/ethernet/adi/
 
 BLACKFIN RTC DRIVER
 M:     Mike Frysinger <[email protected]>
@@ -1528,27 +1571,27 @@ BROADCOM B44 10/100 ETHERNET DRIVER
 M:     Gary Zambrano <[email protected]>
 L:     [email protected]
 S:     Supported
-F:     drivers/net/b44.*
+F:     drivers/net/ethernet/broadcom/b44.*
 
 BROADCOM BNX2 GIGABIT ETHERNET DRIVER
 M:     Michael Chan <[email protected]>
 L:     [email protected]
 S:     Supported
-F:     drivers/net/bnx2.*
-F:     drivers/net/bnx2_*
+F:     drivers/net/ethernet/broadcom/bnx2.*
+F:     drivers/net/ethernet/broadcom/bnx2_*
 
 BROADCOM BNX2X 10 GIGABIT ETHERNET DRIVER
 M:     Eilon Greenstein <[email protected]>
 L:     [email protected]
 S:     Supported
-F:     drivers/net/bnx2x/
+F:     drivers/net/ethernet/broadcom/bnx2x/
 
 BROADCOM TG3 GIGABIT ETHERNET DRIVER
 M:     Matt Carlson <[email protected]>
 M:     Michael Chan <[email protected]>
 L:     [email protected]
 S:     Supported
-F:     drivers/net/tg3.*
+F:     drivers/net/ethernet/broadcom/tg3.*
 
 BROADCOM BRCM80211 IEEE802.11n WIRELESS DRIVER
 M:     Brett Rudley <[email protected]>
@@ -1575,10 +1618,9 @@ F:       drivers/scsi/bfa/
 
 BROCADE BNA 10 GIGABIT ETHERNET DRIVER
 M:     Rasesh Mody <[email protected]>
-M:     Debashis Dutt <[email protected]>
 L:     [email protected]
 S:     Supported
-F:     drivers/net/bna/
+F:     drivers/net/ethernet/brocade/bna/
 
 BSG (block layer generic sg v4 driver)
 M:     FUJITA Tomonori <[email protected]>
@@ -1666,7 +1708,7 @@ CAN NETWORK LAYER
 M:     Oliver Hartkopp <[email protected]>
 M:     Oliver Hartkopp <[email protected]>
 M:     Urs Thuermann <[email protected]>
-L:     [email protected] (subscribers-only)
+L:     [email protected]
 L:     [email protected]
 W:     http://developer.berlios.de/projects/socketcan/
 S:     Maintained
@@ -1675,10 +1717,11 @@ F:      include/linux/can.h
 F:     include/linux/can/core.h
 F:     include/linux/can/bcm.h
 F:     include/linux/can/raw.h
+F:     include/linux/can/gw.h
 
 CAN NETWORK DRIVERS
 M:     Wolfgang Grandegger <[email protected]>
-L:     [email protected] (subscribers-only)
+L:     [email protected]
 L:     [email protected]
 W:     http://developer.berlios.de/projects/socketcan/
 S:     Maintained
@@ -1759,17 +1802,16 @@ F:      Documentation/zh_CN/
 
 CISCO VIC ETHERNET NIC DRIVER
 M:     Christian Benvenuti <[email protected]>
-M:     Vasanthy Kolluri <[email protected]>
 M:     Roopa Prabhu <[email protected]>
 M:     David Wang <[email protected]>
 S:     Supported
-F:     drivers/net/enic/
+F:     drivers/net/ethernet/cisco/enic/
 
 CIRRUS LOGIC EP93XX ETHERNET DRIVER
 M:     Hartley Sweeten <[email protected]>
 L:     [email protected]
 S:     Maintained
-F:     drivers/net/arm/ep93xx_eth.c
+F:     drivers/net/ethernet/cirrus/ep93xx_eth.c
 
 CIRRUS LOGIC EP93XX OHCI USB HOST DRIVER
 M:     Lennert Buytenhek <[email protected]>
@@ -1884,7 +1926,7 @@ S:        Maintained
 F:     drivers/connector/
 
 CONTROL GROUPS (CGROUPS)
-M:     Paul Menage <[email protected]>
+M:     Paul Menage <[email protected]>
 M:     Li Zefan <[email protected]>
 L:     [email protected]
 S:     Maintained
@@ -1909,7 +1951,7 @@ CPMAC ETHERNET DRIVER
 M:     Florian Fainelli <[email protected]>
 L:     [email protected]
 S:     Maintained
-F:     drivers/net/cpmac.c
+F:     drivers/net/ethernet/ti/cpmac.c
 
 CPU FREQUENCY DRIVERS
 M:     Dave Jones <[email protected]>
@@ -1933,7 +1975,7 @@ S:        Maintained
 F:     tools/power/cpupower
 
 CPUSETS
-M:     Paul Menage <[email protected]>
+M:     Paul Menage <[email protected]>
 W:     http://www.bullopensource.org/cpuset/
 W:     http://oss.sgi.com/projects/cpusets/
 S:     Supported
@@ -1996,7 +2038,7 @@ M:        Divy Le Ray <[email protected]>
 L:     [email protected]
 W:     http://www.chelsio.com
 S:     Supported
-F:     drivers/net/cxgb3/
+F:     drivers/net/ethernet/chelsio/cxgb3/
 
 CXGB3 IWARP RNIC DRIVER (IW_CXGB3)
 M:     Steve Wise <[email protected]>
@@ -2010,7 +2052,7 @@ M:        Dimitris Michailidis <[email protected]>
 L:     [email protected]
 W:     http://www.chelsio.com
 S:     Supported
-F:     drivers/net/cxgb4/
+F:     drivers/net/ethernet/chelsio/cxgb4/
 
 CXGB4 IWARP RNIC DRIVER (IW_CXGB4)
 M:     Steve Wise <[email protected]>
@@ -2024,14 +2066,14 @@ M:      Casey Leedom <[email protected]>
 L:     [email protected]
 W:     http://www.chelsio.com
 S:     Supported
-F:     drivers/net/cxgb4vf/
+F:     drivers/net/ethernet/chelsio/cxgb4vf/
 
 STMMAC ETHERNET DRIVER
 M:     Giuseppe Cavallaro <[email protected]>
 L:     [email protected]
 W:     http://www.stlinux.com
 S:     Supported
-F:     drivers/net/stmmac/
+F:     drivers/net/ethernet/stmicro/stmmac/
 
 CYBERPRO FB DRIVER
 M:     Russell King <[email protected]>
@@ -2075,7 +2117,7 @@ DAVICOM FAST ETHERNET (DMFE) NETWORK DRIVER
 L:     [email protected]
 S:     Orphan
 F:     Documentation/networking/dmfe.txt
-F:     drivers/net/tulip/dmfe.c
+F:     drivers/net/ethernet/tulip/dmfe.c
 
 DC390/AM53C974 SCSI driver
 M:     Kurt Garloff <[email protected]>
@@ -2114,7 +2156,7 @@ F:        net/decnet/
 DEFXX FDDI NETWORK DRIVER
 M:     "Maciej W. Rozycki" <[email protected]>
 S:     Maintained
-F:     drivers/net/defxx.*
+F:     drivers/net/fddi/defxx.*
 
 DELL LAPTOP DRIVER
 M:     Matthew Garrett <[email protected]>
@@ -2140,6 +2182,14 @@ M:       Matthew Garrett <[email protected]>
 S:     Maintained
 F:     drivers/platform/x86/dell-wmi.c
 
+DESIGNWARE USB3 DRD IP DRIVER
+M:     Felipe Balbi <[email protected]>
+L:     [email protected]
+L:     [email protected]
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git
+S:     Maintained
+F:     drivers/usb/dwc3/
+
 DEVICE NUMBER REGISTRY
 M:     Torben Mathiasen <[email protected]>
 W:     http://lanana.org/docs/device-list/index.html
@@ -2298,6 +2348,12 @@ L:       [email protected]
 S:     Maintained
 F:     drivers/net/wan/dscc4.c
 
+DYNAMIC DEBUG
+M:     Jason Baron <[email protected]>
+S:     Maintained
+F:     lib/dynamic_debug.c
+F:     include/linux/dynamic_debug.h
+
 DZ DECSTATION DZ11 SERIAL DRIVER
 M:     "Maciej W. Rozycki" <[email protected]>
 S:     Maintained
@@ -2332,7 +2388,7 @@ F:        include/linux/netfilter_bridge/ebt_*.h
 F:     net/bridge/netfilter/ebt*.c
 
 ECRYPT FILE SYSTEM
-M:     Tyler Hicks <tyhicks@linux.vnet.ibm.com>
+M:     Tyler Hicks <tyhicks@canonical.com>
 M:     Dustin Kirkland <[email protected]>
 L:     [email protected]
 W:     https://launchpad.net/ecryptfs
@@ -2413,8 +2469,6 @@ L:        [email protected]
 W:     bluesmoke.sourceforge.net
 S:     Maintained
 F:     drivers/edac/i7core_edac.c
-F:     drivers/edac/edac_mce.c
-F:     include/linux/edac_mce.h
 
 EDAC-I82975X
 M:     Ranganathan Desikan <[email protected]>
@@ -2438,6 +2492,13 @@ W:       bluesmoke.sourceforge.net
 S:     Maintained
 F:     drivers/edac/r82600_edac.c
 
+EDAC-SBRIDGE
+M:     Mauro Carvalho Chehab <[email protected]>
+L:     [email protected]
+W:     bluesmoke.sourceforge.net
+S:     Maintained
+F:     drivers/edac/sb_edac.c
+
 EDIROL UA-101/UA-1000 DRIVER
 M:     Clemens Ladisch <[email protected]>
 L:     [email protected] (moderated for non-subscribers)
@@ -2464,10 +2525,10 @@ S:      Supported
 F:     drivers/infiniband/hw/ehca/
 
 EHEA (IBM pSeries eHEA 10Gb ethernet adapter) DRIVER
-M:     Breno Leitao <leita[email protected]>
+M:     Thadeu Lima de Souza Cascardo <cascard[email protected]>
 L:     [email protected]
 S:     Maintained
-F:     drivers/net/ehea/
+F:     drivers/net/ethernet/ibm/ehea/
 
 EMBEDDED LINUX
 M:     Paul Gortmaker <[email protected]>
@@ -2512,7 +2573,7 @@ ETHEREXPRESS-16 NETWORK DRIVER
 M:     Philip Blundell <[email protected]>
 L:     [email protected]
 S:     Maintained
-F:     drivers/net/eexpress.*
+F:     drivers/net/ethernet/i825xx/eexpress.*
 
 ETHERNET BRIDGE
 M:     Stephen Hemminger <[email protected]>
@@ -2526,7 +2587,7 @@ F:        net/bridge/
 ETHERTEAM 16I DRIVER
 M:     Mika Kuoppala <[email protected]>
 S:     Maintained
-F:     drivers/net/eth16i.c
+F:     drivers/net/ethernet/fujitsu/eth16i.c
 
 EXT2 FILE SYSTEM
 M:     Jan Kara <[email protected]>
@@ -2556,6 +2617,11 @@ S:       Maintained
 F:     Documentation/filesystems/ext4.txt
 F:     fs/ext4/
 
+Extended Verification Module (EVM)
+M:     Mimi Zohar <[email protected]>
+S:     Supported
+F:     security/integrity/evm/
+
 F71805F HARDWARE MONITORING DRIVER
 M:     Jean Delvare <[email protected]>
 L:     [email protected]
@@ -2650,11 +2716,11 @@ F:      drivers/net/wan/dlci.c
 F:     drivers/net/wan/sdla.c
 
 FRAMEBUFFER LAYER
-M:     Paul Mundt <[email protected]>
+M:     Florian Tobias Schandinat <[email protected]>
 L:     [email protected]
 W:     http://linux-fbdev.sourceforge.net/
 Q:     http://patchwork.kernel.org/project/linux-fbdev/list/
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6.git
+T:     git git://github.com/schandinat/linux-2.6.git fbdev-next
 S:     Maintained
 F:     Documentation/fb/
 F:     Documentation/devicetree/bindings/fb/
@@ -2690,7 +2756,7 @@ M:        Vitaly Bordug <[email protected]>
 L:     [email protected]
 L:     [email protected]
 S:     Maintained
-F:     drivers/net/fs_enet/
+F:     drivers/net/ethernet/freescale/fs_enet/
 F:     include/linux/fs_enet_pd.h
 
 FREESCALE QUICC ENGINE LIBRARY
@@ -2712,7 +2778,7 @@ M:        Li Yang <[email protected]>
 L:     [email protected]
 L:     [email protected]
 S:     Maintained
-F:     drivers/net/ucc_geth*
+F:     drivers/net/ethernet/freescale/ucc_geth*
 
 FREESCALE QUICC ENGINE UCC UART DRIVER
 M:     Timur Tabi <[email protected]>
@@ -2737,7 +2803,7 @@ F:        fs/freevxfs/
 FREEZER
 M:     Pavel Machek <[email protected]>
 M:     "Rafael J. Wysocki" <[email protected]>
-L:     linux-pm@lists.linux-foundation.org
+L:     linux-pm@vger.kernel.org
 S:     Supported
 F:     Documentation/power/freezing-of-tasks.txt
 F:     include/linux/freezer.h
@@ -2954,6 +3020,13 @@ F:       Documentation/hw_random.txt
 F:     drivers/char/hw_random/
 F:     include/linux/hw_random.h
 
+HARDWARE SPINLOCK CORE
+M:     Ohad Ben-Cohen <[email protected]>
+S:     Maintained
+F:     Documentation/hwspinlock.txt
+F:     drivers/hwspinlock/hwspinlock_*
+F:     include/linux/hwspinlock.h
+
 HARMONY SOUND DRIVER
 M:     Kyle McMartin <[email protected]>
 L:     [email protected]
@@ -2999,7 +3072,7 @@ F:        drivers/video/hgafb.c
 HIBERNATION (aka Software Suspend, aka swsusp)
 M:     Pavel Machek <[email protected]>
 M:     "Rafael J. Wysocki" <[email protected]>
-L:     linux-pm@lists.linux-foundation.org
+L:     linux-pm@vger.kernel.org
 S:     Supported
 F:     arch/x86/power/
 F:     drivers/base/power/
@@ -3050,6 +3123,7 @@ S:        Maintained
 F:     include/linux/hippidevice.h
 F:     include/linux/if_hippi.h
 F:     net/802/hippi.c
+F:     drivers/net/hippi/
 
 HOST AP DRIVER
 M:     Jouni Malinen <[email protected]>
@@ -3067,7 +3141,7 @@ F:        drivers/platform/x86/tc1100-wmi.c
 HP100: Driver for HP 10/100 Mbit/s Voice Grade Network Adapter Series
 M:     Jaroslav Kysela <[email protected]>
 S:     Maintained
-F:     drivers/net/hp100.*
+F:     drivers/net/ethernet/hp/hp100.*
 
 HPET:  High Precision Event Timers driver
 M:     Clemens Ladisch <[email protected]>
@@ -3145,8 +3219,7 @@ IA64 (Itanium) PLATFORM
 M:     Tony Luck <[email protected]>
 M:     Fenghua Yu <[email protected]>
 L:     [email protected]
-W:     http://www.ia64-linux.org/
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux.git
 S:     Maintained
 F:     arch/ia64/
 
@@ -3165,7 +3238,7 @@ IBM Power Virtual Ethernet Device Driver
 M:     Santiago Leon <[email protected]>
 L:     [email protected]
 S:     Supported
-F:     drivers/net/ibmveth.*
+F:     drivers/net/ethernet/ibm/ibmveth.*
 
 IBM ServeRAID RAID DRIVER
 P:     Jack Hammer
@@ -3184,6 +3257,13 @@ F:       Documentation/ide/
 F:     drivers/ide/
 F:     include/linux/ide.h
 
+IDEAPAD LAPTOP EXTRAS DRIVER
+M:     Ike Panhc <[email protected]>
+L:     [email protected]
+W:     http://launchpad.net/ideapad-laptop
+S:     Maintained
+F:     drivers/platform/x86/ideapad-laptop.c
+
 IDE/ATAPI DRIVERS
 M:     Borislav Petkov <[email protected]>
 L:     [email protected]
@@ -3193,7 +3273,7 @@ F:        drivers/ide/ide-cd*
 
 IDLE-I7300
 M:     Andy Henroid <[email protected]>
-L:     linux-pm@lists.linux-foundation.org
+L:     linux-pm@vger.kernel.org
 S:     Supported
 F:     drivers/idle/i7300_idle.c
 
@@ -3263,9 +3343,20 @@ F:       Documentation/input/multi-touch-protocol.txt
 F:     drivers/input/input-mt.c
 K:     \b(ABS|SYN)_MT_
 
+INTEL C600 SERIES SAS CONTROLLER DRIVER
+M:     Intel SCU Linux support <[email protected]>
+M:     Dan Williams <[email protected]>
+M:     Dave Jiang <[email protected]>
+M:     Ed Nadolski <[email protected]>
+L:     [email protected]
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/djbw/isci.git
+S:     Maintained
+F:     drivers/scsi/isci/
+F:     firmware/isci/
+
 INTEL IDLE DRIVER
 M:     Len Brown <[email protected]>
-L:     linux-pm@lists.linux-foundation.org
+L:     linux-pm@vger.kernel.org
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-idle-2.6.git
 S:     Supported
 F:     drivers/idle/intel_idle.c
@@ -3306,7 +3397,7 @@ M:        David Woodhouse <[email protected]>
 L:     [email protected]
 T:     git git://git.infradead.org/iommu-2.6.git
 S:     Supported
-F:     drivers/pci/intel-iommu.c
+F:     drivers/iommu/intel-iommu.c
 F:     include/linux/intel-iommu.h
 
 INTEL IOP-ADMA DMA DRIVER
@@ -3321,7 +3412,7 @@ F:        arch/arm/mach-ixp4xx/include/mach/qmgr.h
 F:     arch/arm/mach-ixp4xx/include/mach/npe.h
 F:     arch/arm/mach-ixp4xx/ixp4xx_qmgr.c
 F:     arch/arm/mach-ixp4xx/ixp4xx_npe.c
-F:     drivers/net/arm/ixp4xx_eth.c
+F:     drivers/net/ethernet/xscale/ixp4xx_eth.c
 F:     drivers/net/wan/ixp4xx_hss.c
 
 INTEL IXP4XX RANDOM NUMBER GENERATOR SUPPORT
@@ -3333,7 +3424,7 @@ INTEL IXP2000 ETHERNET DRIVER
 M:     Lennert Buytenhek <[email protected]>
 L:     [email protected]
 S:     Maintained
-F:     drivers/net/ixp2000/
+F:     drivers/net/ethernet/xscale/ixp2000/
 
 INTEL ETHERNET DRIVERS (e100/e1000/e1000e/igb/igbvf/ixgb/ixgbe/ixgbevf)
 M:     Jeff Kirsher <[email protected]>
@@ -3342,13 +3433,13 @@ M:      Bruce Allan <[email protected]>
 M:     Carolyn Wyborny <[email protected]>
 M:     Don Skidmore <[email protected]>
 M:     Greg Rose <[email protected]>
-M:     PJ Waskiewicz <[email protected]>
+M:     Peter P Waskiewicz Jr <[email protected]>
 M:     Alex Duyck <[email protected]>
 M:     John Ronciak <[email protected]>
 L:     [email protected]
 W:     http://e1000.sourceforge.net/
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-2.6.git
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next-2.6.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next.git
 S:     Supported
 F:     Documentation/networking/e100.txt
 F:     Documentation/networking/e1000.txt
@@ -3358,18 +3449,11 @@ F:      Documentation/networking/igbvf.txt
 F:     Documentation/networking/ixgb.txt
 F:     Documentation/networking/ixgbe.txt
 F:     Documentation/networking/ixgbevf.txt
-F:     drivers/net/e100.c
-F:     drivers/net/e1000/
-F:     drivers/net/e1000e/
-F:     drivers/net/igb/
-F:     drivers/net/igbvf/
-F:     drivers/net/ixgb/
-F:     drivers/net/ixgbe/
-F:     drivers/net/ixgbevf/
+F:     drivers/net/ethernet/intel/
 
 INTEL MRST PMU DRIVER
 M:     Len Brown <[email protected]>
-L:     linux-pm@lists.linux-foundation.org
+L:     linux-pm@vger.kernel.org
 S:     Supported
 F:     arch/x86/platform/mrst/pmu.*
 
@@ -3417,7 +3501,7 @@ M:        Wey-Yi Guy <[email protected]>
 M:     Intel Linux Wireless <[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
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi.git
 S:     Supported
 F:     drivers/net/wireless/iwlwifi/
 
@@ -3433,7 +3517,7 @@ IOC3 ETHERNET DRIVER
 M:     Ralf Baechle <[email protected]>
 L:     [email protected]
 S:     Maintained
-F:     drivers/net/ioc3-eth.c
+F:     drivers/net/ethernet/sgi/ioc3-eth.c
 
 IOC3 SERIAL DRIVER
 M:     Pat Gefre <[email protected]>
@@ -3451,7 +3535,7 @@ M:        Francois Romieu <[email protected]>
 M:     Sorbica Shieh <[email protected]>
 L:     [email protected]
 S:     Maintained
-F:     drivers/net/ipg.*
+F:     drivers/net/ethernet/icplus/ipg.*
 
 IPATH DRIVER
 M:     Mike Marciniszyn <[email protected]>
@@ -3599,7 +3683,7 @@ JME NETWORK DRIVER
 M:     Guo-Fu Tseng <[email protected]>
 L:     [email protected]
 S:     Maintained
-F:     drivers/net/jme.*
+F:     drivers/net/ethernet/jme.*
 
 JOURNALLING FLASH FILE SYSTEM V2 (JFFS2)
 M:     David Woodhouse <[email protected]>
@@ -3906,9 +3990,9 @@ F:        arch/powerpc/platforms/powermac/
 F:     drivers/macintosh/
 
 LINUX FOR POWERPC EMBEDDED MPC5XXX
-M:     Grant Likely <[email protected]>
+M:     Anatolij Gustschin <[email protected]>
 L:     [email protected]
-T:     git git://git.secretlab.ca/git/linux-2.6.git
+T:     git git://git.denx.de/linux-2.6-agust.git
 S:     Maintained
 F:     arch/powerpc/platforms/512x/
 F:     arch/powerpc/platforms/52xx/
@@ -3966,6 +4050,7 @@ M:        Eric Piel <[email protected]>
 S:     Maintained
 F:     Documentation/misc-devices/lis3lv02d
 F:     drivers/misc/lis3lv02d/
+F:     drivers/platform/x86/hp_accel.c
 
 LLC (802.2)
 M:     Arnaldo Carvalho de Melo <[email protected]>
@@ -4060,7 +4145,7 @@ S:        Maintained
 
 M32R ARCHITECTURE
 M:     Hirokazu Takata <[email protected]>
-L:     [email protected]
+L:     [email protected] (moderated for non-subscribers)
 L:     [email protected] (in Japanese)
 W:     http://www.linux-m32r.org/
 S:     Maintained
@@ -4130,7 +4215,7 @@ MARVELL MV643XX ETHERNET DRIVER
 M:     Lennert Buytenhek <[email protected]>
 L:     [email protected]
 S:     Maintained
-F:     drivers/net/mv643xx_eth.*
+F:     drivers/net/ethernet/marvell/mv643xx_eth.*
 F:     include/linux/mv643xx.h
 
 MARVELL MWIFIEX WIRELESS DRIVER
@@ -4229,7 +4314,7 @@ F:        include/mtd/
 
 MICROBLAZE ARCHITECTURE
 M:     Michal Simek <[email protected]>
-L:     [email protected]
+L:     [email protected] (moderated for non-subscribers)
 W:     http://www.monstr.eu/fdt/
 T:     git git://git.monstr.eu/linux-2.6-microblaze.git
 S:     Supported
@@ -4344,12 +4429,12 @@ M:      Andrew Gallatin <[email protected]>
 L:     [email protected]
 W:     http://www.myri.com/scs/download-Myri10GE.html
 S:     Supported
-F:     drivers/net/myri10ge/
+F:     drivers/net/ethernet/myricom/myri10ge/
 
 NATSEMI ETHERNET DRIVER (DP8381x)
 M:     Tim Hockin <[email protected]>
 S:     Maintained
-F:     drivers/net/natsemi.c
+F:     drivers/net/ethernet/natsemi/natsemi.c
 
 NATIVE INSTRUMENTS USB SOUND INTERFACE DRIVER
 M:     Daniel Mack <[email protected]>
@@ -4389,23 +4474,21 @@ W:      http://trac.neterion.com/cgi-bin/trac.cgi/wiki/Linux?Anonymous
 W:     http://trac.neterion.com/cgi-bin/trac.cgi/wiki/X3100Linux?Anonymous
 S:     Supported
 F:     Documentation/networking/s2io.txt
-F:     drivers/net/s2io*
 F:     Documentation/networking/vxge.txt
-F:     drivers/net/vxge/
+F:     drivers/net/ethernet/neterion/
 
 NETFILTER/IPTABLES/IPCHAINS
-P:     Rusty Russell
-P:     Marc Boucher
-P:     James Morris
 P:     Harald Welte
 P:     Jozsef Kadlecsik
+M:     Pablo Neira Ayuso <[email protected]>
 M:     Patrick McHardy <[email protected]>
 L:     [email protected]
 L:     [email protected]
 L:     [email protected]
 W:     http://www.netfilter.org/
 W:     http://www.iptables.org/
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf-2.6.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf-next-2.6.git
 S:     Supported
 F:     include/linux/netfilter*
 F:     include/linux/netfilter/
@@ -4451,8 +4534,8 @@ M:        "David S. Miller" <[email protected]>
 L:     [email protected]
 W:     http://www.linuxfoundation.org/en/Net
 W:     http://patchwork.ozlabs.org/project/netdev/list/
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.git
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git
 S:     Maintained
 F:     net/
 F:     include/net/
@@ -4504,11 +4587,23 @@ F:      include/linux/if_*
 F:     include/linux/*device.h
 
 NETXEN (1/10) GbE SUPPORT
-M:     Amit Kumar Salecha <[email protected]>
+M:     Sony Chacko <[email protected]>
+M:     Rajesh Borundia <[email protected]>
 L:     [email protected]
 W:     http://www.qlogic.com
 S:     Supported
-F:     drivers/net/netxen/
+F:     drivers/net/ethernet/qlogic/netxen/
+
+NFC SUBSYSTEM
+M:     Lauro Ramos Venancio <[email protected]>
+M:     Aloisio Almeida Jr <[email protected]>
+M:     Samuel Ortiz <[email protected]>
+L:     [email protected]
+S:     Maintained
+F:     net/nfc/
+F:     include/linux/nfc.h
+F:     include/net/nfc/
+F:     drivers/nfc/
 
 NFS, SUNRPC, AND LOCKD CLIENTS
 M:     Trond Myklebust <[email protected]>
@@ -4529,7 +4624,7 @@ M:        Jan-Pascal van Best <[email protected]>
 M:     Andreas Mohr <[email protected]>
 L:     [email protected]
 S:     Maintained
-F:     drivers/net/ni5010.*
+F:     drivers/net/ethernet/racal/ni5010.*
 
 NILFS2 FILESYSTEM
 M:     KONISHI Ryusuke <[email protected]>
@@ -4578,7 +4673,7 @@ L:        [email protected]
 W:     http://www.muru.com/linux/omap/
 W:     http://linux.omap.com/
 Q:     http://patchwork.kernel.org/project/linux-omap/list/
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git
 S:     Maintained
 F:     arch/arm/*omap*/
 
@@ -4626,6 +4721,13 @@ S:       Maintained
 F:     drivers/video/omap2/
 F:     Documentation/arm/OMAP/DSS
 
+OMAP HARDWARE SPINLOCK SUPPORT
+M:     Ohad Ben-Cohen <[email protected]>
+L:     [email protected]
+S:     Maintained
+F:     drivers/hwspinlock/omap_hwspinlock.c
+F:     arch/arm/mach-omap2/hwspinlock.c
+
 OMAP MMC SUPPORT
 M:     Jarkko Lavinen <[email protected]>
 L:     [email protected]
@@ -4720,10 +4822,12 @@ F:      drivers/i2c/busses/i2c-ocores.c
 
 OPEN FIRMWARE AND FLATTENED DEVICE TREE
 M:     Grant Likely <[email protected]>
+M:     Rob Herring <[email protected]>
 L:     [email protected] (moderated for non-subscribers)
 W:     http://fdt.secretlab.ca
 T:     git git://git.secretlab.ca/git/linux-2.6.git
 S:     Maintained
+F:     Documentation/devicetree
 F:     drivers/of
 F:     include/linux/of*.h
 K:     of_get_property
@@ -4732,7 +4836,7 @@ K:        of_match_table
 OPENRISC ARCHITECTURE
 M:     Jonas Bonn <[email protected]>
 W:     http://openrisc.net
-L:     [email protected]
+L:     [email protected] (moderated for non-subscribers)
 S:     Maintained
 T:     git git://openrisc.net/~jonas/linux
 F:     arch/openrisc
@@ -4775,7 +4879,7 @@ F:        drivers/net/wireless/orinoco/
 
 OSD LIBRARY and FILESYSTEM
 M:     Boaz Harrosh <[email protected]>
-M:     Benny Halevy <bhalevy@panasas.com>
+M:     Benny Halevy <bhalevy@tonian.com>
 L:     [email protected]
 W:     http://open-osd.org
 T:     git git://git.open-osd.org/open-osd.git
@@ -4795,7 +4899,7 @@ PA SEMI ETHERNET DRIVER
 M:     Olof Johansson <[email protected]>
 L:     [email protected]
 S:     Maintained
-F:     drivers/net/pasemi_mac.*
+F:     drivers/net/ethernet/pasemi/*
 
 PA SEMI SMBUS DRIVER
 M:     Olof Johansson <[email protected]>
@@ -4906,7 +5010,7 @@ F:        include/linux/i2c-algo-pca.h
 F:     include/linux/i2c-pca-platform.h
 
 PCI ERROR RECOVERY
-M:     Linas Vepstas <linas@austin.ibm.com>
+M:     Linas Vepstas <linasvepstas@gmail.com>
 L:     [email protected]
 S:     Supported
 F:     Documentation/PCI/pci-error-recovery.txt
@@ -4942,7 +5046,7 @@ PCNET32 NETWORK DRIVER
 M:     Don Fry <[email protected]>
 L:     [email protected]
 S:     Maintained
-F:     drivers/net/pcnet32.c
+F:     drivers/net/ethernet/amd/pcnet32.c
 
 PCRYPT PARALLEL CRYPTO ENGINE
 M:     Steffen Klassert <[email protected]>
@@ -4972,7 +5076,7 @@ M:        Paul Mackerras <[email protected]>
 M:     Ingo Molnar <[email protected]>
 M:     Arnaldo Carvalho de Melo <[email protected]>
 S:     Supported
-F:     kernel/perf_event*.c
+F:     kernel/events/*
 F:     include/linux/perf_event.h
 F:     arch/*/kernel/perf_event*.c
 F:     arch/*/kernel/*/perf_event*.c
@@ -5002,6 +5106,11 @@ L:       [email protected]
 S:     Maintained
 F:     drivers/mtd/devices/phram.c
 
+PIN CONTROL SUBSYSTEM
+M:     Linus Walleij <[email protected]>
+S:     Maintained
+F:     drivers/pinmux/
+
 PKTCDVD DRIVER
 M:     Peter Osterlund <[email protected]>
 S:     Maintained
@@ -5074,7 +5183,7 @@ PPP PROTOCOL DRIVERS AND COMPRESSORS
 M:     Paul Mackerras <[email protected]>
 L:     [email protected]
 S:     Maintained
-F:     drivers/net/ppp_*
+F:     drivers/net/ppp/ppp_*
 
 PPP OVER ATM (RFC 2364)
 M:     Mitchell Blank Jr <[email protected]>
@@ -5085,8 +5194,8 @@ F:        include/linux/atmppp.h
 PPP OVER ETHERNET
 M:     Michal Ostrowski <[email protected]>
 S:     Maintained
-F:     drivers/net/pppoe.c
-F:     drivers/net/pppox.c
+F:     drivers/net/ppp/pppoe.c
+F:     drivers/net/ppp/pppox.c
 
 PPP OVER L2TP
 M:     James Chapman <[email protected]>
@@ -5107,7 +5216,7 @@ PPTP DRIVER
 M:     Dmitry Kozlov <[email protected]>
 L:     [email protected]
 S:     Maintained
-F:     drivers/net/pptp.c
+F:     drivers/net/ppp/pptp.c
 W:     http://sourceforge.net/projects/accel-pptp
 
 PREEMPTIBLE KERNEL
@@ -5136,7 +5245,7 @@ M:        Geoff Levand <[email protected]>
 L:     [email protected]
 L:     [email protected]
 S:     Maintained
-F:     drivers/net/ps3_gelic_net.*
+F:     drivers/net/ethernet/toshiba/ps3_gelic_net.*
 
 PS3 PLATFORM SUPPORT
 M:     Geoff Levand <[email protected]>
@@ -5254,23 +5363,24 @@ M:      [email protected]
 L:     [email protected]
 S:     Supported
 F:     Documentation/networking/LICENSE.qla3xxx
-F:     drivers/net/qla3xxx.*
+F:     drivers/net/ethernet/qlogic/qla3xxx.*
 
 QLOGIC QLCNIC (1/10)Gb ETHERNET DRIVER
-M:     Amit Kumar Salecha <[email protected]>
 M:     Anirban Chakraborty <[email protected]>
+M:     Sony Chacko <[email protected]>
 M:     [email protected]
 L:     [email protected]
 S:     Supported
-F:     drivers/net/qlcnic/
+F:     drivers/net/ethernet/qlogic/qlcnic/
 
 QLOGIC QLGE 10Gb ETHERNET DRIVER
+M:     Anirban Chakraborty <[email protected]>
 M:     Jitendra Kalsaria <[email protected]>
 M:     Ron Mercer <[email protected]>
 M:     [email protected]
 L:     [email protected]
 S:     Supported
-F:     drivers/net/qlge/
+F:     drivers/net/ethernet/qlogic/qlge/
 
 QNX4 FILESYSTEM
 M:     Anders Larsen <[email protected]>
@@ -5280,6 +5390,12 @@ F:       fs/qnx4/
 F:     include/linux/qnx4_fs.h
 F:     include/linux/qnxtypes.h
 
+QUALCOMM HEXAGON ARCHITECTURE
+M:     Richard Kuo <[email protected]>
+L:     [email protected]
+S:     Supported
+F:     arch/hexagon/
+
 RADOS BLOCK DEVICE (RBD)
 F:     include/linux/qnxtypes.h
 M:     Yehuda Sadeh <[email protected]>
@@ -5352,10 +5468,10 @@ RDC R6040 FAST ETHERNET DRIVER
 M:     Florian Fainelli <[email protected]>
 L:     [email protected]
 S:     Maintained
-F:     drivers/net/r6040.c
+F:     drivers/net/ethernet/rdc/r6040.c
 
 RDS - RELIABLE DATAGRAM SOCKETS
-M:     Andy Grover <andy.grover@oracle.com>
+M:     Venkat Venkatsubra <venkat.x.venkatsubra@oracle.com>
 L:     [email protected] (moderated for non-subscribers)
 S:     Supported
 F:     net/rds/
@@ -5756,7 +5872,7 @@ M:        Ajit Khaparde <[email protected]>
 L:     [email protected]
 W:     http://www.emulex.com
 S:     Supported
-F:     drivers/net/benet/
+F:     drivers/net/ethernet/emulex/benet/
 
 SFC NETWORK DRIVER
 M:     Solarflare linux maintainers <[email protected]>
@@ -5764,7 +5880,7 @@ M:        Steve Hodgson <[email protected]>
 M:     Ben Hutchings <[email protected]>
 L:     [email protected]
 S:     Supported
-F:     drivers/net/sfc/
+F:     drivers/net/ethernet/sfc/
 
 SGI GRU DRIVER
 M:     Jack Steiner <[email protected]>
@@ -5830,14 +5946,14 @@ SIS 190 ETHERNET DRIVER
 M:     Francois Romieu <[email protected]>
 L:     [email protected]
 S:     Maintained
-F:     drivers/net/sis190.c
+F:     drivers/net/ethernet/sis/sis190.c
 
 SIS 900/7016 FAST ETHERNET DRIVER
 M:     Daniele Venzano <[email protected]>
 W:     http://www.brownhat.org/sis900.html
 L:     [email protected]
 S:     Maintained
-F:     drivers/net/sis900.*
+F:     drivers/net/ethernet/sis/sis900.*
 
 SIS 96X I2C/SMBUS DRIVER
 M:     "Mark M. Hoffman" <[email protected]>
@@ -5864,8 +5980,7 @@ SKGE, SKY2 10/100/1000 GIGABIT ETHERNET DRIVERS
 M:     Stephen Hemminger <[email protected]>
 L:     [email protected]
 S:     Maintained
-F:     drivers/net/skge.*
-F:     drivers/net/sky2.*
+F:     drivers/net/ethernet/marvell/sk*
 
 SLAB ALLOCATOR
 M:     Christoph Lameter <[email protected]>
@@ -5879,7 +5994,7 @@ F:        mm/sl?b.c
 SMC91x ETHERNET DRIVER
 M:     Nicolas Pitre <[email protected]>
 S:     Odd Fixes
-F:     drivers/net/smc91x.*
+F:     drivers/net/ethernet/smsc/smc91x.*
 
 SMM665 HARDWARE MONITOR DRIVER
 M:     Guenter Roeck <[email protected]>
@@ -5914,13 +6029,19 @@ M:      Steve Glendinning <[email protected]>
 L:     [email protected]
 S:     Supported
 F:     include/linux/smsc911x.h
-F:     drivers/net/smsc911x.*
+F:     drivers/net/ethernet/smsc/smsc911x.*
 
 SMSC9420 PCI ETHERNET DRIVER
 M:     Steve Glendinning <[email protected]>
 L:     [email protected]
 S:     Supported
-F:     drivers/net/smsc9420.*
+F:     drivers/net/ethernet/smsc/smsc9420.*
+
+SMSC UFX6000 and UFX7000 USB to VGA DRIVER
+M:     Steve Glendinning <[email protected]>
+L:     [email protected]
+S:     Supported
+F:     drivers/video/smscufx.c
 
 SN-IA64 (Itanium) SUB-PLATFORM
 M:     Jes Sorensen <[email protected]>
@@ -5954,7 +6075,7 @@ SONIC NETWORK DRIVER
 M:     Thomas Bogendoerfer <[email protected]>
 L:     [email protected]
 S:     Maintained
-F:     drivers/net/sonic.*
+F:     drivers/net/ethernet/natsemi/sonic.*
 
 SONICS SILICON BACKPLANE DRIVER (SSB)
 M:     Michael Buesch <[email protected]>
@@ -6001,7 +6122,7 @@ F:        sound/
 SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEMENT (ASoC)
 M:     Liam Girdwood <[email protected]>
 M:     Mark Brown <[email protected]>
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
 L:     [email protected] (moderated for non-subscribers)
 W:     http://alsa-project.org/main/index.php/ASoC
 S:     Supported
@@ -6095,7 +6216,7 @@ M:        Jens Osterkamp <[email protected]>
 L:     [email protected]
 S:     Supported
 F:     Documentation/networking/spider_net.txt
-F:     drivers/net/spider_net*
+F:     drivers/net/ethernet/toshiba/spider_net*
 
 SPU FILE SYSTEM
 M:     Jeremy Kerr <[email protected]>
@@ -6126,7 +6247,7 @@ S:        Maintained
 
 STAGING SUBSYSTEM
 M:     Greg Kroah-Hartman <[email protected]>
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git
 L:     [email protected]
 S:     Maintained
 F:     drivers/staging/
@@ -6142,12 +6263,6 @@ M:       Jakub Schmidtke <[email protected]>
 S:     Odd Fixes
 F:     drivers/staging/asus_oled/
 
-STAGING - ATHEROS ATH6KL WIRELESS DRIVER
-M:     Luis R. Rodriguez <[email protected]>
-M:     Naveen Singh <[email protected]>
-S:     Odd Fixes
-F:     drivers/staging/ath6kl/
-
 STAGING - COMEDI
 M:     Ian Abbott <[email protected]>
 M:     Mori Hess <[email protected]>
@@ -6173,6 +6288,11 @@ M:       David Rowe <[email protected]>
 S:     Odd Fixes
 F:     drivers/staging/echo/
 
+STAGING - ET131X NETWORK DRIVER
+M:     Mark Einon <[email protected]>
+S:     Odd Fixes
+F:     drivers/staging/et131x/
+
 STAGING - FLARION FT1000 DRIVERS
 M:     Marek Belisko <[email protected]>
 S:     Odd Fixes
@@ -6201,6 +6321,13 @@ W:       http://www.lirc.org/
 S:     Odd Fixes
 F:     drivers/staging/lirc/
 
+STAGING - NVIDIA COMPLIANT EMBEDDED CONTROLLER INTERFACE (nvec)
+M:     Julian Andres Klode <[email protected]>
+M:     Marc Dietrich <[email protected]>
+L:     [email protected] (moderated for non-subscribers)
+S:     Maintained
+F:     drivers/staging/nvec/
+
 STAGING - OLPC SECONDARY DISPLAY CONTROLLER (DCON)
 M:     Andres Salomon <[email protected]>
 M:     Chris Ball <[email protected]>
@@ -6273,7 +6400,7 @@ F:        drivers/staging/xgifb/
 STARFIRE/DURALAN NETWORK DRIVER
 M:     Ion Badulescu <[email protected]>
 S:     Odd Fixes
-F:     drivers/net/starfire*
+F:     drivers/net/ethernet/adaptec/starfire*
 
 SUN3/3X
 M:     Sam Creasey <[email protected]>
@@ -6282,6 +6409,7 @@ S:        Maintained
 F:     arch/m68k/kernel/*sun3*
 F:     arch/m68k/sun3*/
 F:     arch/m68k/include/asm/sun3*
+F:     drivers/net/ethernet/i825xx/sun3*
 
 SUPERH
 M:     Paul Mundt <[email protected]>
@@ -6298,7 +6426,7 @@ SUSPEND TO RAM
 M:     Len Brown <[email protected]>
 M:     Pavel Machek <[email protected]>
 M:     "Rafael J. Wysocki" <[email protected]>
-L:     linux-pm@lists.linux-foundation.org
+L:     linux-pm@vger.kernel.org
 S:     Supported
 F:     Documentation/power/
 F:     arch/x86/kernel/acpi/
@@ -6358,19 +6486,18 @@ F:      net/ipv4/tcp_lp.c
 
 TEGRA SUPPORT
 M:     Colin Cross <[email protected]>
-M:     Erik Gilling <[email protected]>
 M:     Olof Johansson <[email protected]>
+M:     Stephen Warren <[email protected]>
 L:     [email protected]
-T:     git git://android.git.kernel.org/kernel/tegra.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/olof/tegra.git
 S:     Supported
 F:     arch/arm/mach-tegra
 
 TEHUTI ETHERNET DRIVER
-M:     Alexander Indenbaum <[email protected]>
 M:     Andy Gospodarek <[email protected]>
 L:     [email protected]
 S:     Supported
-F:     drivers/net/tehuti*
+F:     drivers/net/ethernet/tehuti/*
 
 Telecom Clock Driver for MCPL0010
 M:     Mark Gross <[email protected]>
@@ -6421,7 +6548,7 @@ W:        http://www.tilera.com/scm/
 S:     Supported
 F:     arch/tile/
 F:     drivers/tty/hvc/hvc_tile.c
-F:     drivers/net/tile/
+F:     drivers/net/ethernet/tile/
 F:     drivers/edac/tile_edac.c
 
 TLAN NETWORK DRIVER
@@ -6430,7 +6557,7 @@ L:        [email protected] (subscribers-only)
 W:     http://sourceforge.net/projects/tlan/
 S:     Maintained
 F:     Documentation/networking/tlan.txt
-F:     drivers/net/tlan.*
+F:     drivers/net/ethernet/ti/tlan.*
 
 TOMOYO SECURITY MODULE
 M:     Kentaro Takeda <[email protected]>
@@ -6440,7 +6567,7 @@ L:        [email protected] (subscribers-only, for users in English)
 L:     [email protected] (subscribers-only, for developers in Japanese)
 L:     [email protected] (subscribers-only, for users in Japanese)
 W:     http://tomoyo.sourceforge.jp/
-T:     quilt http://svn.sourceforge.jp/svnroot/tomoyo/trunk/2.4.x/tomoyo-lsm/patches/
+T:     quilt http://svn.sourceforge.jp/svnroot/tomoyo/trunk/2.5.x/tomoyo-lsm/patches/
 S:     Maintained
 F:     security/tomoyo/
 
@@ -6524,7 +6651,7 @@ TULIP NETWORK DRIVERS
 M:     Grant Grundler <[email protected]>
 L:     [email protected]
 S:     Maintained
-F:     drivers/net/tulip/
+F:     drivers/net/ethernet/tulip/
 
 TUN/TAP driver
 M:     Maxim Krasnyansky <[email protected]>
@@ -6570,11 +6697,10 @@ W:      http://uclinux-h8.sourceforge.jp/
 S:     Supported
 F:     arch/h8300/
 F:     drivers/ide/ide-h8300.c
-F:     drivers/net/ne-h8300.c
+F:     drivers/net/ethernet/8390/ne-h8300.c
 
 UDF FILESYSTEM
 M:     Jan Kara <[email protected]>
-W:     http://linux-udf.sourceforge.net
 S:     Maintained
 F:     Documentation/filesystems/udf.txt
 F:     fs/udf/
@@ -6998,7 +7124,7 @@ F:        include/linux/vhost.h
 VIA RHINE NETWORK DRIVER
 M:     Roger Luethi <[email protected]>
 S:     Maintained
-F:     drivers/net/via-rhine.c
+F:     drivers/net/ethernet/via/via-rhine.c
 
 VIAPRO SMBUS DRIVER
 M:     Jean Delvare <[email protected]>
@@ -7026,7 +7152,7 @@ VIA VELOCITY NETWORK DRIVER
 M:     Francois Romieu <[email protected]>
 L:     [email protected]
 S:     Maintained
-F:     drivers/net/via-velocity.*
+F:     drivers/net/ethernet/via/via-velocity.*
 
 VLAN (802.1Q)
 M:     Patrick McHardy <[email protected]>
@@ -7089,7 +7215,7 @@ S:        Supported
 F:     drivers/mmc/host/vub300.c
 
 W1 DALLAS'S 1-WIRE BUS
-M:     Evgeniy Polyakov <[email protected]>
+M:     Evgeniy Polyakov <[email protected]>
 S:     Maintained
 F:     Documentation/w1/
 F:     drivers/w1/
@@ -7135,6 +7261,12 @@ L:       [email protected]
 S:     Maintained
 F:     drivers/scsi/wd7000.c
 
+WIIMOTE HID DRIVER
+M:     David Herrmann <[email protected]>
+L:     [email protected]
+S:     Maintained
+F:     drivers/hid/hid-wiimote*
+
 WINBOND CIR DRIVER
 M:     David Härdeman <[email protected]>
 S:     Maintained
@@ -7364,7 +7496,7 @@ THE REST
 M:     Linus Torvalds <[email protected]>
 L:     [email protected]
 Q:     http://patchwork.kernel.org/project/LKML/list/
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
 S:     Buried alive in reporters
 F:     *
 F:     */