1 files changed, 93 insertions, 96 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index c3ec9555adc9..2a90101309d1 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -184,11 +184,6 @@ S:	Maintained
 F:      Documentation/filesystems/9p.txt
 F:      fs/9p/
 
-A2232 SERIAL BOARD DRIVER
-L:      linux-m68k@lists.linux-m68k.org
-S:      Orphan
-F:      drivers/staging/generic_serial/ser_a2232*
-
 AACRAID SCSI RAID DRIVER
 M:      Adaptec OEM Raid Solutions <aacraid@adaptec.com>
 L:      linux-scsi@vger.kernel.org
@@ -347,7 +342,7 @@ S:	Supported
 F:      drivers/mfd/adp5520.c
 F:      drivers/video/backlight/adp5520_bl.c
 F:      drivers/leds/leds-adp5520.c
-F:      drivers/gpio/adp5520-gpio.c
+F:      drivers/gpio/gpio-adp5520.c
 F:      drivers/input/keyboard/adp5520-keys.c
 
 ADP5588 QWERTY KEYPAD AND IO EXPANDER DRIVER (ADP5588/ADP5587)
@@ -356,7 +351,7 @@ L:	device-drivers-devel@blackfin.uclinux.org
 W:      http://wiki.analog.com/ADP5588
 S:      Supported
 F:      drivers/input/keyboard/adp5588-keys.c
-F:      drivers/gpio/adp5588-gpio.c
+F:      drivers/gpio/gpio-adp5588.c
 
 ADP8860 BACKLIGHT DRIVER (ADP8860/ADP8861/ADP8863)
 M:      Michael Hennerich <michael.hennerich@analog.com>
@@ -542,6 +537,7 @@ F:	sound/soc/codecs/adau*
 F:      sound/soc/codecs/adav*
 F:      sound/soc/codecs/ad1*
 F:      sound/soc/codecs/ssm*
+F:      sound/soc/codecs/sigmadsp.*
 
 ANALOG DEVICES INC ASOC DRIVERS
 L:      uclinux-dist-devel@blackfin.uclinux.org
@@ -919,7 +915,6 @@ M:	Lennert Buytenhek <kernel@wantstofly.org>
 M:      Nicolas Pitre <nico@fluxnic.net>
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:      Odd Fixes
-F:      arch/arm/mach-loki/
 F:      arch/arm/mach-kirkwood/
 F:      arch/arm/mach-mv78xx0/
 F:      arch/arm/mach-orion5x/
@@ -1081,8 +1076,8 @@ L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:      Maintained
 F:      arch/arm/mach-s5pv210/mach-aquila.c
 F:      arch/arm/mach-s5pv210/mach-goni.c
-F:      arch/arm/mach-exynos4/mach-universal_c210.c
-F:      arch/arm/mach-exynos4/mach-nuri.c
+F:      arch/arm/mach-exynos/mach-universal_c210.c
+F:      arch/arm/mach-exynos/mach-nuri.c
 
 ARM/SAMSUNG S5P SERIES FIMC SUPPORT
 M:      Kyungmin Park <kyungmin.park@samsung.com>
@@ -1110,7 +1105,6 @@ M:	Tomasz Stanislawski <t.stanislaws@samsung.com>
 L:      linux-arm-kernel@lists.infradead.org
 L:      linux-media@vger.kernel.org
 S:      Maintained
-F:      arch/arm/plat-s5p/dev-tv.c
 F:      drivers/media/video/s5p-tv/
 
 ARM/SHMOBILE ARM ARCHITECTURE
@@ -1124,13 +1118,6 @@ S:	Supported
 F:      arch/arm/mach-shmobile/
 F:      drivers/sh/
 
-ARM/TELECHIPS ARM ARCHITECTURE
-M:      "Hans J. Koch" <hjk@hansjkoch.de>
-L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
-S:      Maintained
-F:      arch/arm/plat-tcc/
-F:      arch/arm/mach-tcc8k/
-
 ARM/TECHNOLOGIC SYSTEMS TS7250 MACHINE SUPPORT
 M:      Lennert Buytenhek <kernel@wantstofly.org>
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@ -1152,14 +1139,13 @@ L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 W:      http://www.mcuos.com
 S:      Maintained
 F:      arch/arm/mach-w90x900/
-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/ethernet/nuvoton/w90p910_ether.c
 F:      drivers/mtd/nand/nuc900_nand.c
 F:      drivers/rtc/rtc-nuc900.c
-F:      drivers/spi/spi_nuc900.c
+F:      drivers/spi/spi-nuc900.c
 F:      drivers/usb/host/ehci-w90x900.c
 F:      drivers/video/nuc900fb.c
 
@@ -1184,7 +1170,6 @@ L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:      Maintained
 F:      arch/arm/mach-ux500/
 F:      drivers/dma/ste_dma40*
-F:      drivers/mfd/ab3550*
 F:      drivers/mfd/abx500*
 F:      drivers/mfd/ab8500*
 F:      drivers/mfd/stmpe*
@@ -1364,7 +1349,7 @@ F:	drivers/net/ethernet/cadence/
 ATMEL SPI DRIVER
 M:      Nicolas Ferre <nicolas.ferre@atmel.com>
 S:      Supported
-F:      drivers/spi/atmel_spi.*
+F:      drivers/spi/spi-atmel.*
 
 ATMEL USBA UDC DRIVER
 M:      Nicolas Ferre <nicolas.ferre@atmel.com>
@@ -1503,7 +1488,7 @@ M:	Sonic Zhang <sonic.zhang@analog.com>
 L:      uclinux-dist-devel@blackfin.uclinux.org
 W:      http://blackfin.uclinux.org
 S:      Supported
-F:      drivers/tty/serial/bfin_5xx.c
+F:      drivers/tty/serial/bfin_uart.c
 
 BLACKFIN WATCHDOG DRIVER
 M:      Mike Frysinger <vapier.adi@gmail.com>
@@ -1594,7 +1579,7 @@ M:	Franky (Zhenhui) Lin <frankyl@broadcom.com>
 M:      Kan Yan <kanyan@broadcom.com>
 L:      linux-wireless@vger.kernel.org
 S:      Supported
-F:      drivers/staging/brcm80211/
+F:      drivers/net/wireless/brcm80211/
 
 BROADCOM BNX2FC 10 GIGABIT FCOE DRIVER
 M:      Bhanu Prakash Gollapudi <bprakash@broadcom.com>
@@ -1633,7 +1618,7 @@ BT8XXGPIO DRIVER
 M:      Michael Buesch <m@bues.ch>
 W:      http://bu3sch.de/btgpio.php
 S:      Maintained
-F:      drivers/gpio/bt8xxgpio.c
+F:      drivers/gpio/gpio-bt8xx.c
 
 BTRFS FILE SYSTEM
 M:      Chris Mason <chris.mason@oracle.com>
@@ -1661,6 +1646,14 @@ T:	git git://git.alsa-project.org/alsa-kernel.git
 S:      Maintained
 F:      sound/pci/oxygen/
 
+C6X ARCHITECTURE
+M:      Mark Salter <msalter@redhat.com>
+M:      Aurelien Jacquiot <a-jacquiot@ti.com>
+L:      linux-c6x-dev@linux-c6x.org
+W:      http://www.linux-c6x.org/wiki/index.php/Main_Page
+S:      Maintained
+F:      arch/c6x/
+
 CACHEFILES: FS-CACHE BACKEND FOR CACHING ON MOUNTED FILESYSTEMS
 M:      David Howells <dhowells@redhat.com>
 L:      linux-cachefs@redhat.com
@@ -1674,7 +1667,7 @@ L:	linux-media@vger.kernel.org
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
 S:      Maintained
 F:      Documentation/video4linux/cafe_ccic
-F:      drivers/media/video/cafe_ccic*
+F:      drivers/media/video/marvell-ccic/
 
 CAIF NETWORK LAYER
 M:      Sjur Braendeland <sjur.brandeland@stericsson.com>
@@ -1898,12 +1891,6 @@ L:	platform-driver-x86@vger.kernel.org
 S:      Maintained
 F:      drivers/platform/x86/compal-laptop.c
 
-COMPUTONE INTELLIPORT MULTIPORT CARD
-W:      http://www.wittsend.com/computone.html
-S:      Orphan
-F:      Documentation/serial/computone.txt
-F:      drivers/staging/tty/ip2/
-
 CONEXANT ACCESSRUNNER USB DRIVER
 M:      Simon Arlott <cxacru@fire.lp0.eu>
 L:      accessrunner-general@lists.sourceforge.net
@@ -2118,7 +2105,7 @@ DAVICOM FAST ETHERNET (DMFE) NETWORK DRIVER
 L:      netdev@vger.kernel.org
 S:      Orphan
 F:      Documentation/networking/dmfe.txt
-F:      drivers/net/ethernet/tulip/dmfe.c
+F:      drivers/net/ethernet/dec/tulip/dmfe.c
 
 DC390/AM53C974 SCSI driver
 M:      Kurt Garloff <garloff@suse.de>
@@ -2191,6 +2178,13 @@ T:	git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git
 S:      Maintained
 F:      drivers/usb/dwc3/
 
+DEVICE FREQUENCY (DEVFREQ)
+M:      MyungJoo Ham <myungjoo.ham@samsung.com>
+M:      Kyungmin Park <kyungmin.park@samsung.com>
+L:      linux-kernel@vger.kernel.org
+S:      Maintained
+F:      drivers/devfreq/
+
 DEVICE NUMBER REGISTRY
 M:      Torben Mathiasen <device@lanana.org>
 W:      http://lanana.org/docs/device-list/index.html
@@ -2207,15 +2201,6 @@ F:	drivers/md/dm*
 F:      include/linux/device-mapper.h
 F:      include/linux/dm-*.h
 
-DIGI INTL. EPCA DRIVER
-M:      "Digi International, Inc" <Eng.Linux@digi.com>
-L:      Eng.Linux@digi.com
-W:      http://www.digi.com
-S:      Orphan
-F:      Documentation/serial/digiepca.txt
-F:      drivers/staging/tty/epca*
-F:      drivers/staging/tty/digi*
-
 DIOLAN U2C-12 I2C DRIVER
 M:      Guenter Roeck <guenter.roeck@ericsson.com>
 L:      linux-i2c@vger.kernel.org
@@ -2927,6 +2912,7 @@ F:	include/linux/gigaset_dev.h
 
 GPIO SUBSYSTEM
 M:      Grant Likely <grant.likely@secretlab.ca>
+M:      Linus Walleij <linus.walleij@stericsson.com>
 S:      Maintained
 T:      git git://git.secretlab.ca/git/linux-2.6.git
 F:      Documentation/gpio.txt
@@ -2944,7 +2930,7 @@ GRETH 10/100/1G Ethernet MAC device driver
 M:      Kristoffer Glembo <kristoffer@gaisler.com>
 L:      netdev@vger.kernel.org
 S:      Maintained
-F:      drivers/net/greth*
+F:      drivers/net/ethernet/aeroflex/
 
 GSPCA FINEPIX SUBDRIVER
 M:      Frank Zago <frank@zago.net>
@@ -3196,6 +3182,16 @@ M:	William Irwin <wli@holomorphy.com>
 S:      Maintained
 F:      fs/hugetlbfs/
 
+Hyper-V CORE AND DRIVERS
+M:      K. Y. Srinivasan <kys@microsoft.com>
+M:      Haiyang Zhang <haiyangz@microsoft.com>
+L:      devel@linuxdriverproject.org
+S:      Maintained
+F:      drivers/hv/
+F:      drivers/hid/hid-hyperv.c
+F:      drivers/net/hyperv/
+F:      drivers/staging/hv/
+
 I2C/SMBUS STUB DRIVER
 M:      "Mark M. Hoffman" <mhoffman@lightlink.com>
 L:      linux-i2c@vger.kernel.org
@@ -3205,6 +3201,7 @@ F:	drivers/i2c/busses/i2c-stub.c
 I2C SUBSYSTEM
 M:      "Jean Delvare (PC drivers, core)" <khali@linux-fr.org>
 M:      "Ben Dooks (embedded platforms)" <ben-linux@fluff.org>
+M:      "Wolfram Sang (embedded platforms)" <w.sang@pengutronix.de>
 L:      linux-i2c@vger.kernel.org
 W:      http://i2c.wiki.kernel.org/
 T:      quilt kernel.org/pub/linux/kernel/people/jdelvare/linux-2.6/jdelvare-i2c/
@@ -3591,8 +3588,7 @@ F:	net/netfilter/ipvs/
 IPWIRELESS DRIVER
 M:      Jiri Kosina <jkosina@suse.cz>
 M:      David Sterba <dsterba@suse.cz>
-S:      Maintained
-T:      git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/ipwireless_cs.git
+S:      Odd Fixes
 F:      drivers/tty/ipwireless/
 
 IPX NETWORK LAYER
@@ -3787,7 +3783,6 @@ S:	Odd Fixes
 
 KERNEL NFSD, SUNRPC, AND LOCKD SERVERS
 M:      "J. Bruce Fields" <bfields@fieldses.org>
-M:      Neil Brown <neilb@suse.de>
 L:      linux-nfs@vger.kernel.org
 W:      http://nfs.sourceforge.net/
 S:      Supported
@@ -3885,8 +3880,7 @@ L:	keyrings@linux-nfs.org
 S:      Supported
 F:      Documentation/security/keys-trusted-encrypted.txt
 F:      include/keys/encrypted-type.h
-F:      security/keys/encrypted.c
-F:      security/keys/encrypted.h
+F:      security/keys/encrypted-keys/
 
 KGDB / KDB /debug_core
 M:      Jason Wessel <jason.wessel@windriver.com>
@@ -4019,7 +4013,7 @@ M:	Josh Boyer <jwboyer@gmail.com>
 M:      Matt Porter <mporter@kernel.crashing.org>
 W:      http://www.penguinppc.org/
 L:      linuxppc-dev@lists.ozlabs.org
-T:      git git://git.kernel.org/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx.git
+T:      git git://git.infradead.org/users/jwboyer/powerpc-4xx.git
 S:      Maintained
 F:      arch/powerpc/platforms/40x/
 F:      arch/powerpc/platforms/44x/
@@ -4697,6 +4691,8 @@ Q:	http://patchwork.kernel.org/project/linux-omap/list/
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git
 S:      Maintained
 F:      arch/arm/*omap*/
+F:      drivers/i2c/busses/i2c-omap.c
+F:      include/linux/i2c-omap.h
 
 OMAP CLOCK FRAMEWORK SUPPORT
 M:      Paul Walmsley <paul@pwsan.com>
@@ -4862,6 +4858,14 @@ S:	Maintained
 T:      git git://openrisc.net/~jonas/linux
 F:      arch/openrisc
 
+OPENVSWITCH
+M:      Jesse Gross <jesse@nicira.com>
+L:      dev@openvswitch.org
+W:      http://openvswitch.org
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/jesse/openvswitch.git
+S:      Maintained
+F:      net/openvswitch/
+
 OPL4 DRIVER
 M:      Clemens Ladisch <clemens@ladisch.de>
 L:      alsa-devel@alsa-project.org (moderated for non-subscribers)
@@ -5128,10 +5132,19 @@ L:	linux-mtd@lists.infradead.org
 S:      Maintained
 F:      drivers/mtd/devices/phram.c
 
+PICOXCELL SUPPORT
+M:      Jamie Iles <jamie@jamieiles.com>
+L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+T:      git git://github.com/jamieiles/linux-2.6-ji.git
+S:      Supported
+F:      arch/arm/mach-picoxcell
+F:      drivers/*/picoxcell*
+F:      drivers/*/*/picoxcell*
+
 PIN CONTROL SUBSYSTEM
 M:      Linus Walleij <linus.walleij@linaro.org>
 S:      Maintained
-F:      drivers/pinmux/
+F:      drivers/pinctrl/
 
 PKTCDVD DRIVER
 M:      Peter Osterlund <petero2@telia.com>
@@ -5314,35 +5327,27 @@ F:	drivers/media/video/pvrusb2/
 PXA2xx/PXA3xx SUPPORT
 M:      Eric Miao <eric.y.miao@gmail.com>
 M:      Russell King <linux@arm.linux.org.uk>
+M:      Haojian Zhuang <haojian.zhuang@marvell.com>
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+T:      git git://github.com/hzhuang1/linux.git
+T:      git git://git.linaro.org/people/ycmiao/pxa-linux.git
 S:      Maintained
 F:      arch/arm/mach-pxa/
 F:      drivers/pcmcia/pxa2xx*
-F:      drivers/spi/pxa2xx*
+F:      drivers/spi/spi-pxa2xx*
 F:      drivers/usb/gadget/pxa2*
 F:      include/sound/pxa2xx-lib.h
 F:      sound/arm/pxa*
 F:      sound/soc/pxa
 
-PXA168 SUPPORT
-M:      Eric Miao <eric.y.miao@gmail.com>
-M:      Jason Chagas <jason.chagas@marvell.com>
-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
+MMP SUPPORT
 M:      Eric Miao <eric.y.miao@gmail.com>
-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
-
-MMP2 SUPPORT (aka ARMADA610)
 M:      Haojian Zhuang <haojian.zhuang@marvell.com>
-M:      Eric Miao <eric.y.miao@gmail.com>
 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
+T:      git git://github.com/hzhuang1/linux.git
+T:      git git://git.linaro.org/people/ycmiao/pxa-linux.git
 S:      Maintained
+F:      arch/arm/mach-mmp/
 
 PXA MMCI DRIVER
 S:      Orphan
@@ -5381,6 +5386,7 @@ S:	Supported
 F:      drivers/scsi/qla4xxx/
 
 QLOGIC QLA3XXX NETWORK DRIVER
+M:      Jitendra Kalsaria <jitendra.kalsaria@qlogic.com>
 M:      Ron Mercer <ron.mercer@qlogic.com>
 M:      linux-driver@qlogic.com
 L:      netdev@vger.kernel.org
@@ -5551,11 +5557,6 @@ M:	Maxim Levitsky <maximlevitsky@gmail.com>
 S:      Maintained
 F:      drivers/memstick/host/r592.*
 
-RISCOM8 DRIVER
-S:      Orphan
-F:      Documentation/serial/riscom8.txt
-F:      drivers/staging/tty/riscom8*
-
 ROCKETPORT DRIVER
 P:      Comtrol Corp.
 W:      http://www.comtrol.com
@@ -5676,6 +5677,12 @@ L:	alsa-devel@alsa-project.org (moderated for non-subscribers)
 S:      Supported
 F:      sound/soc/samsung
 
+SAMSUNG FRAMEBUFFER DRIVER
+M:      Jingoo Han <jg1.han@samsung.com>
+L:      linux-fbdev@vger.kernel.org
+S:      Maintained
+F:      drivers/video/s3c-fb.c
+
 SERIAL DRIVERS
 M:      Alan Cox <alan@linux.intel.com>
 L:      linux-serial@vger.kernel.org
@@ -5815,13 +5822,14 @@ L:	linux-mmc@vger.kernel.org
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc.git
 S:      Maintained
 F:      drivers/mmc/host/sdhci.*
+F:      drivers/mmc/host/sdhci-pltfm.[ch]
 
 SECURE DIGITAL HOST CONTROLLER INTERFACE, OPEN FIRMWARE BINDINGS (SDHCI-OF)
 M:      Anton Vorontsov <avorontsov@ru.mvista.com>
 L:      linuxppc-dev@lists.ozlabs.org
 L:      linux-mmc@vger.kernel.org
 S:      Maintained
-F:      drivers/mmc/host/sdhci-of.*
+F:      drivers/mmc/host/sdhci-pltfm.[ch]
 
 SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) SAMSUNG DRIVER
 M:      Ben Dooks <ben-linux@fluff.org>
@@ -5900,7 +5908,6 @@ F:	drivers/net/ethernet/emulex/benet/
 
 SFC NETWORK DRIVER
 M:      Solarflare linux maintainers <linux-net-drivers@solarflare.com>
-M:      Steve Hodgson <shodgson@solarflare.com>
 M:      Ben Hutchings <bhutchings@solarflare.com>
 L:      netdev@vger.kernel.org
 S:      Supported
@@ -5965,6 +5972,7 @@ L:	davinci-linux-open-source@linux.davincidsp.com (subscribers-only)
 Q:      http://patchwork.kernel.org/project/linux-davinci/list/
 S:      Supported
 F:      arch/arm/mach-davinci
+F:      drivers/i2c/busses/i2c-davinci.c
 
 SIS 190 ETHERNET DRIVER
 M:      Francois Romieu <romieu@fr.zoreil.com>
@@ -6201,9 +6209,7 @@ M:	Viresh Kumar <viresh.kumar@st.com>
 W:      http://www.st.com/spear
 S:      Maintained
 F:      arch/arm/mach-spear*/clock.c
-F:      arch/arm/mach-spear*/include/mach/clkdev.h
 F:      arch/arm/plat-spear/clock.c
-F:      arch/arm/plat-spear/include/plat/clkdev.h
 F:      arch/arm/plat-spear/include/plat/clock.h
 
 SPEAR PAD MULTIPLEXING SUPPORT
@@ -6219,11 +6225,6 @@ F:	arch/arm/mach-spear3xx/spear3*0_evb.c
 F:      arch/arm/mach-spear6xx/spear600.c
 F:      arch/arm/mach-spear6xx/spear600_evb.c
 
-SPECIALIX IO8+ MULTIPORT SERIAL CARD DRIVER
-S:      Orphan
-F:      Documentation/serial/specialix.txt
-F:      drivers/staging/tty/specialix*
-
 SPI SUBSYSTEM
 M:      Grant Likely <grant.likely@secretlab.ca>
 L:      spi-devel-general@lists.sourceforge.net
@@ -6266,7 +6267,7 @@ F:	arch/alpha/kernel/srm_env.c
 
 STABLE BRANCH
 M:      Greg Kroah-Hartman <greg@kroah.com>
-L:      stable@kernel.org
+L:      stable@vger.kernel.org
 S:      Maintained
 
 STAGING SUBSYSTEM
@@ -6301,11 +6302,6 @@ M:	Manu Abraham <abraham.manu@gmail.com>
 S:      Odd Fixes
 F:      drivers/staging/crystalhd/
 
-STAGING - CYPRESS WESTBRIDGE SUPPORT
-M:      David Cross <david.cross@cypress.com>
-S:      Odd Fixes
-F:      drivers/staging/westbridge/
-
 STAGING - ECHO CANCELLER
 M:      Steve Underwood <steveu@coppice.org>
 M:      David Rowe <david@rowetel.com>
@@ -6327,12 +6323,6 @@ M:	David Täht <d@teklibre.com>
 S:      Odd Fixes
 F:      drivers/staging/frontier/
 
-STAGING - HYPER-V (MICROSOFT)
-M:      Hank Janssen <hjanssen@microsoft.com>
-M:      Haiyang Zhang <haiyangz@microsoft.com>
-S:      Odd Fixes
-F:      drivers/staging/hv/
-
 STAGING - INDUSTRIAL IO
 M:      Jonathan Cameron <jic23@cam.ac.uk>
 L:      linux-iio@vger.kernel.org
@@ -6343,7 +6333,7 @@ STAGING - LIRC (LINUX INFRARED REMOTE CONTROL) DRIVERS
 M:      Jarod Wilson <jarod@wilsonet.com>
 W:      http://www.lirc.org/
 S:      Odd Fixes
-F:      drivers/staging/lirc/
+F:      drivers/staging/media/lirc/
 
 STAGING - NVIDIA COMPLIANT EMBEDDED CONTROLLER INTERFACE (nvec)
 M:      Julian Andres Klode <jak@jak-linux.org>
@@ -6379,7 +6369,7 @@ F:	drivers/staging/sm7xx/
 STAGING - SOFTLOGIC 6x10 MPEG CODEC
 M:      Ben Collins <bcollins@bluecherry.net>
 S:      Odd Fixes
-F:      drivers/staging/solo6x10/
+F:      drivers/staging/media/solo6x10/
 
 STAGING - SPEAKUP CONSOLE SPEECH DRIVER
 M:      William Hubbs <w.d.hubbs@gmail.com>
@@ -6417,7 +6407,7 @@ S:	Odd Fixes
 F:      drivers/staging/winbond/
 
 STAGING - XGI Z7,Z9,Z11 PCI DISPLAY DRIVER
-M:      Arnaud Patard <apatard@mandriva.com>
+M:      Arnaud Patard <arnaud.patard@rtp-net.org>
 S:      Odd Fixes
 F:      drivers/staging/xgifb/
 
@@ -6508,6 +6498,13 @@ W:	http://tcp-lp-mod.sourceforge.net/
 S:      Maintained
 F:      net/ipv4/tcp_lp.c
 
+TEAM DRIVER
+M:      Jiri Pirko <jpirko@redhat.com>
+L:      netdev@vger.kernel.org
+S:      Supported
+F:      drivers/net/team/
+F:      include/linux/if_team.h
+
 TEGRA SUPPORT
 M:      Colin Cross <ccross@android.com>
 M:      Olof Johansson <olof@lixom.net>
@@ -6675,7 +6672,7 @@ TULIP NETWORK DRIVERS
 M:      Grant Grundler <grundler@parisc-linux.org>
 L:      netdev@vger.kernel.org
 S:      Maintained
-F:      drivers/net/ethernet/tulip/
+F:      drivers/net/ethernet/dec/tulip/
 
 TUN/TAP driver
 M:      Maxim Krasnyansky <maxk@qualcomm.com>