Merge tag 'v3.7-rc3' into next to sync up with recent USB and MFD changes

1 files changed, 518 insertions, 99 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index fdc0119963e7..1fa907441f8f 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -184,6 +184,16 @@ S:	Maintained
 F:      Documentation/filesystems/9p.txt
 F:      fs/9p/
 
+A8293 MEDIA DRIVER
+M:      Antti Palosaari <crope@iki.fi>
+L:      linux-media@vger.kernel.org
+W:      http://linuxtv.org/
+W:      http://palosaari.fi/linux/
+Q:      http://patchwork.linuxtv.org/project/linux-media/list/
+T:      git git://linuxtv.org/anttip/media_tree.git
+S:      Maintained
+F:      drivers/media/dvb-frontends/a8293*
+
 AACRAID SCSI RAID DRIVER
 M:      Adaptec OEM Raid Solutions <aacraid@adaptec.com>
 L:      linux-scsi@vger.kernel.org
@@ -225,6 +235,7 @@ F:	drivers/platform/x86/acer-wmi.c
 
 ACPI
 M:      Len Brown <lenb@kernel.org>
+M:      Rafael J. Wysocki <rjw@sisk.pl>
 L:      linux-acpi@vger.kernel.org
 W:      http://www.lesswatts.org/projects/acpi/
 Q:      http://patchwork.kernel.org/project/linux-acpi/list/
@@ -391,6 +402,26 @@ M:	Riccardo Facchetti <fizban@tin.it>
 S:      Maintained
 F:      sound/oss/aedsp16.c
 
+AF9013 MEDIA DRIVER
+M:      Antti Palosaari <crope@iki.fi>
+L:      linux-media@vger.kernel.org
+W:      http://linuxtv.org/
+W:      http://palosaari.fi/linux/
+Q:      http://patchwork.linuxtv.org/project/linux-media/list/
+T:      git git://linuxtv.org/anttip/media_tree.git
+S:      Maintained
+F:      drivers/media/dvb-frontends/af9013*
+
+AF9033 MEDIA DRIVER
+M:      Antti Palosaari <crope@iki.fi>
+L:      linux-media@vger.kernel.org
+W:      http://linuxtv.org/
+W:      http://palosaari.fi/linux/
+Q:      http://patchwork.linuxtv.org/project/linux-media/list/
+T:      git git://linuxtv.org/anttip/media_tree.git
+S:      Maintained
+F:      drivers/media/dvb-frontends/af9033*
+
 AFFS FILE SYSTEM
 L:      linux-fsdevel@vger.kernel.org
 S:      Orphan
@@ -572,7 +603,7 @@ F:	drivers/net/appletalk/
 F:      net/appletalk/
 
 ARASAN COMPACT FLASH PATA CONTROLLER
-M:     Viresh Kumar <viresh.linux@gmail.com>
+M:      Viresh Kumar <viresh.linux@gmail.com>
 L:      linux-ide@vger.kernel.org
 S:      Maintained
 F:      include/linux/pata_arasan_cf_data.h
@@ -595,7 +626,6 @@ M:	Will Deacon <will.deacon@arm.com>
 S:      Maintained
 F:      arch/arm/kernel/perf_event*
 F:      arch/arm/oprofile/common.c
-F:      arch/arm/kernel/pmu.c
 F:      arch/arm/include/asm/pmu.h
 F:      arch/arm/kernel/hw_breakpoint.c
 F:      arch/arm/include/asm/hw_breakpoint.h
@@ -607,6 +637,13 @@ W:	http://www.arm.linux.org.uk/
 S:      Maintained
 F:      arch/arm/
 
+ARM SUB-ARCHITECTURES
+L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+S:      MAINTAINED
+F:      arch/arm/mach-*/
+F:      arch/arm/plat-*/
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git
+
 ARM PRIMECELL AACI PL041 DRIVER
 M:      Russell King <linux@arm.linux.org.uk>
 S:      Maintained
@@ -658,22 +695,6 @@ W:	http://www.linux4sam.org
 S:      Supported
 F:      arch/arm/mach-at91/
 
-ARM/BCMRING ARM ARCHITECTURE
-M:      Jiandong Zheng <jdzheng@broadcom.com>
-M:      Scott Branden <sbranden@broadcom.com>
-L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
-S:      Maintained
-F:      arch/arm/mach-bcmring
-
-ARM/BCMRING MTD NAND DRIVER
-M:      Jiandong Zheng <jdzheng@broadcom.com>
-M:      Scott Branden <sbranden@broadcom.com>
-L:      linux-mtd@lists.infradead.org
-S:      Maintained
-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 <rob.herring@calxeda.com>
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@ -777,6 +798,7 @@ S:	Maintained
 T:      git git://git.pengutronix.de/git/imx/linux-2.6.git
 F:      arch/arm/mach-imx/
 F:      arch/arm/plat-mxc/
+F:      arch/arm/configs/imx*_defconfig
 
 ARM/FREESCALE IMX6
 M:      Shawn Guo <shawn.guo@linaro.org>
@@ -913,6 +935,12 @@ W:	http://www.digriz.org.uk/ts78xx/kernel
 S:      Maintained
 F:      arch/arm/mach-orion5x/ts78xx-*
 
+ARM/MICREL KS8695 ARCHITECTURE
+M:      Greg Ungerer <gerg@uclinux.org>
+L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+F:      arch/arm/mach-ks8695
+S:      Odd Fixes
+
 ARM/MIOA701 MACHINE SUPPORT
 M:      Robert Jarzmik <robert.jarzmik@free.fr>
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@ -1073,7 +1101,7 @@ L:	linux-media@vger.kernel.org
 S:      Maintained
 F:      arch/arm/plat-s5p/dev-fimc*
 F:      arch/arm/plat-samsung/include/plat/*fimc*
-F:      drivers/media/video/s5p-fimc/
+F:      drivers/media/platform/s5p-fimc/
 
 ARM/SAMSUNG S5P SERIES Multi Format Codec (MFC) SUPPORT
 M:      Kyungmin Park <kyungmin.park@samsung.com>
@@ -1083,7 +1111,7 @@ L:	linux-arm-kernel@lists.infradead.org
 L:      linux-media@vger.kernel.org
 S:      Maintained
 F:      arch/arm/plat-s5p/dev-mfc.c
-F:      drivers/media/video/s5p-mfc/
+F:      drivers/media/platform/s5p-mfc/
 
 ARM/SAMSUNG S5P SERIES TV SUBSYSTEM SUPPORT
 M:      Kyungmin Park <kyungmin.park@samsung.com>
@@ -1091,7 +1119,7 @@ M:	Tomasz Stanislawski <t.stanislaws@samsung.com>
 L:      linux-arm-kernel@lists.infradead.org
 L:      linux-media@vger.kernel.org
 S:      Maintained
-F:      drivers/media/video/s5p-tv/
+F:      drivers/media/platform/s5p-tv/
 
 ARM/SHMOBILE ARM ARCHITECTURE
 M:      Paul Mundt <lethal@linux-sh.org>
@@ -1209,6 +1237,12 @@ S:	Maintained
 F:      arch/arm/mach-pxa/z2.c
 F:      arch/arm/mach-pxa/include/mach/z2.h
 
+ARM64 PORT (AARCH64 ARCHITECTURE)
+M:      Catalin Marinas <catalin.marinas@arm.com>
+L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+S:      Maintained
+F:      arch/arm64/
+
 ASC7621 HARDWARE MONITOR DRIVER
 M:      George Joseph <george.joseph@fairview5.com>
 L:      lm-sensors@lm-sensors.org
@@ -1250,7 +1284,7 @@ F:	include/linux/i2c/at24.h
 
 ATA OVER ETHERNET (AOE) DRIVER
 M:      "Ed L. Cashin" <ecashin@coraid.com>
-W:      http://www.coraid.com/support/linux
+W:      http://support.coraid.com/support/linux
 S:      Supported
 F:      Documentation/aoe/
 F:      drivers/block/aoe/
@@ -1357,7 +1391,7 @@ ATMEL ISI DRIVER
 M:      Josh Wu <josh.wu@atmel.com>
 L:      linux-media@vger.kernel.org
 S:      Supported
-F:      drivers/media/video/atmel-isi.c
+F:      drivers/media/platform/atmel-isi.c
 F:      include/media/atmel-isi.h
 
 ATMEL LCDFB DRIVER
@@ -1518,7 +1552,7 @@ S:	Supported
 F:      drivers/rtc/rtc-bfin.c
 
 BLACKFIN SDH DRIVER
-M:      Cliff Cai <cliff.cai@analog.com>
+M:      Sonic Zhang <sonic.zhang@analog.com>
 L:      uclinux-dist-devel@blackfin.uclinux.org
 W:      http://blackfin.uclinux.org
 S:      Supported
@@ -1613,6 +1647,16 @@ L:	netdev@vger.kernel.org
 S:      Supported
 F:      drivers/net/ethernet/broadcom/bnx2x/
 
+BROADCOM BCM2835 ARM ARCHICTURE
+M:      Stephen Warren <swarren@wwwdotorg.org>
+L:      linux-rpi-kernel@lists.infradead.org (moderated for non-subscribers)
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-rpi.git
+S:      Maintained
+F:      arch/arm/mach-bcm2835/
+F:      arch/arm/boot/dts/bcm2835*
+F:      arch/arm/configs/bcm2835_defconfig
+F:      drivers/*/*bcm2835*
+
 BROADCOM TG3 GIGABIT ETHERNET DRIVER
 M:      Matt Carlson <mcarlson@broadcom.com>
 M:      Michael Chan <mchan@broadcom.com>
@@ -1645,7 +1689,6 @@ F:	drivers/bcma/
 F:      include/linux/bcma/
 
 BROCADE BFA FC SCSI DRIVER
-M:      Jing Huang <huangj@brocade.com>
 M:      Krishna C Gudipati <kgudipat@brocade.com>
 L:      linux-scsi@vger.kernel.org
 S:      Supported
@@ -1695,7 +1738,7 @@ W:	http://linuxtv.org
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git
 S:      Maintained
 F:      Documentation/video4linux/bttv/
-F:      drivers/media/video/bt8xx/bttv*
+F:      drivers/media/pci/bt8xx/bttv*
 
 C-MEDIA CMI8788 DRIVER
 M:      Clemens Ladisch <clemens@ladisch.de>
@@ -1725,7 +1768,7 @@ L:	linux-media@vger.kernel.org
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git
 S:      Maintained
 F:      Documentation/video4linux/cafe_ccic
-F:      drivers/media/video/marvell-ccic/
+F:      drivers/media/platform/marvell-ccic/
 
 CAIF NETWORK LAYER
 M:      Sjur Braendeland <sjur.brandeland@stericsson.com>
@@ -1923,10 +1966,10 @@ S:	Supported
 F:      drivers/platform/x86/classmate-laptop.c
 
 COCCINELLE/Semantic Patches (SmPL)
-M:      Julia Lawall <julia@diku.dk>
+M:      Julia Lawall <Julia.Lawall@lip6.fr>
 M:      Gilles Muller <Gilles.Muller@lip6.fr>
-M:      Nicolas Palix <npalix.work@gmail.com>
-L:      cocci@diku.dk (moderated for non-subscribers)
+M:      Nicolas Palix <nicolas.palix@imag.fr>
+L:      cocci@systeme.lip6.fr (moderated for non-subscribers)
 W:      http://coccinelle.lip6.fr/
 S:      Supported
 F:      scripts/coccinelle/
@@ -2114,7 +2157,17 @@ W:	http://linuxtv.org
 W:      http://www.ivtvdriver.org/index.php/Cx18
 S:      Maintained
 F:      Documentation/video4linux/cx18.txt
-F:      drivers/media/video/cx18/
+F:      drivers/media/pci/cx18/
+
+CXD2820R MEDIA DRIVER
+M:      Antti Palosaari <crope@iki.fi>
+L:      linux-media@vger.kernel.org
+W:      http://linuxtv.org/
+W:      http://palosaari.fi/linux/
+Q:      http://patchwork.linuxtv.org/project/linux-media/list/
+T:      git git://linuxtv.org/anttip/media_tree.git
+S:      Maintained
+F:      drivers/media/dvb-frontends/cxd2820r*
 
 CXGB3 ETHERNET DRIVER (CXGB3)
 M:      Divy Le Ray <divy@chelsio.com>
@@ -2378,11 +2431,6 @@ S:	Maintained
 F:      Documentation/hwmon/dme1737
 F:      drivers/hwmon/dme1737.c
 
-DOCBOOK FOR DOCUMENTATION
-M:      Randy Dunlap <rdunlap@xenotime.net>
-S:      Maintained
-F:      scripts/kernel-doc
-
 DOCKING STATION DRIVER
 M:      Shaohua Li <shaohua.li@intel.com>
 L:      linux-acpi@vger.kernel.org
@@ -2469,6 +2517,117 @@ L:	netdev@vger.kernel.org
 S:      Maintained
 F:      drivers/net/wan/dscc4.c
 
+DVB_USB_AF9015 MEDIA DRIVER
+M:      Antti Palosaari <crope@iki.fi>
+L:      linux-media@vger.kernel.org
+W:      http://linuxtv.org/
+W:      http://palosaari.fi/linux/
+Q:      http://patchwork.linuxtv.org/project/linux-media/list/
+T:      git git://linuxtv.org/anttip/media_tree.git
+S:      Maintained
+F:      drivers/media/usb/dvb-usb-v2/af9015*
+
+DVB_USB_AF9035 MEDIA DRIVER
+M:      Antti Palosaari <crope@iki.fi>
+L:      linux-media@vger.kernel.org
+W:      http://linuxtv.org/
+W:      http://palosaari.fi/linux/
+Q:      http://patchwork.linuxtv.org/project/linux-media/list/
+T:      git git://linuxtv.org/anttip/media_tree.git
+S:      Maintained
+F:      drivers/media/usb/dvb-usb-v2/af9035*
+
+DVB_USB_ANYSEE MEDIA DRIVER
+M:      Antti Palosaari <crope@iki.fi>
+L:      linux-media@vger.kernel.org
+W:      http://linuxtv.org/
+W:      http://palosaari.fi/linux/
+Q:      http://patchwork.linuxtv.org/project/linux-media/list/
+T:      git git://linuxtv.org/anttip/media_tree.git
+S:      Maintained
+F:      drivers/media/usb/dvb-usb-v2/anysee*
+
+DVB_USB_AU6610 MEDIA DRIVER
+M:      Antti Palosaari <crope@iki.fi>
+L:      linux-media@vger.kernel.org
+W:      http://linuxtv.org/
+W:      http://palosaari.fi/linux/
+Q:      http://patchwork.linuxtv.org/project/linux-media/list/
+T:      git git://linuxtv.org/anttip/media_tree.git
+S:      Maintained
+F:      drivers/media/usb/dvb-usb-v2/au6610*
+
+DVB_USB_CE6230 MEDIA DRIVER
+M:      Antti Palosaari <crope@iki.fi>
+L:      linux-media@vger.kernel.org
+W:      http://linuxtv.org/
+W:      http://palosaari.fi/linux/
+Q:      http://patchwork.linuxtv.org/project/linux-media/list/
+T:      git git://linuxtv.org/anttip/media_tree.git
+S:      Maintained
+F:      drivers/media/usb/dvb-usb-v2/ce6230*
+
+DVB_USB_CXUSB MEDIA DRIVER
+M:      Michael Krufky <mkrufky@linuxtv.org>
+L:      linux-media@vger.kernel.org
+W:      http://linuxtv.org/
+W:      http://github.com/mkrufky
+Q:      http://patchwork.linuxtv.org/project/linux-media/list/
+T:      git git://linuxtv.org/media_tree.git
+S:      Maintained
+F:      drivers/media/usb/dvb-usb-v2/cxusb*
+
+DVB_USB_CYPRESS_FIRMWARE MEDIA DRIVER
+M:      Antti Palosaari <crope@iki.fi>
+L:      linux-media@vger.kernel.org
+W:      http://linuxtv.org/
+W:      http://palosaari.fi/linux/
+Q:      http://patchwork.linuxtv.org/project/linux-media/list/
+T:      git git://linuxtv.org/anttip/media_tree.git
+S:      Maintained
+F:      drivers/media/usb/dvb-usb-v2/cypress_firmware*
+
+DVB_USB_EC168 MEDIA DRIVER
+M:      Antti Palosaari <crope@iki.fi>
+L:      linux-media@vger.kernel.org
+W:      http://linuxtv.org/
+W:      http://palosaari.fi/linux/
+Q:      http://patchwork.linuxtv.org/project/linux-media/list/
+T:      git git://linuxtv.org/anttip/media_tree.git
+S:      Maintained
+F:      drivers/media/usb/dvb-usb-v2/ec168*
+
+DVB_USB_MXL111SF MEDIA DRIVER
+M:      Michael Krufky <mkrufky@linuxtv.org>
+L:      linux-media@vger.kernel.org
+W:      http://linuxtv.org/
+W:      http://github.com/mkrufky
+Q:      http://patchwork.linuxtv.org/project/linux-media/list/
+T:      git git://linuxtv.org/mkrufky/mxl111sf.git
+S:      Maintained
+F:      drivers/media/usb/dvb-usb-v2/mxl111sf*
+
+DVB_USB_RTL28XXU MEDIA DRIVER
+M:      Antti Palosaari <crope@iki.fi>
+L:      linux-media@vger.kernel.org
+W:      http://linuxtv.org/
+W:      http://palosaari.fi/linux/
+Q:      http://patchwork.linuxtv.org/project/linux-media/list/
+T:      git git://linuxtv.org/anttip/media_tree.git
+S:      Maintained
+F:      drivers/media/usb/dvb-usb-v2/rtl28xxu*
+
+DVB_USB_V2 MEDIA DRIVER
+M:      Antti Palosaari <crope@iki.fi>
+L:      linux-media@vger.kernel.org
+W:      http://linuxtv.org/
+W:      http://palosaari.fi/linux/
+Q:      http://patchwork.linuxtv.org/project/linux-media/list/
+T:      git git://linuxtv.org/anttip/media_tree.git
+S:      Maintained
+F:      drivers/media/usb/dvb-usb-v2/dvb_usb*
+F:      drivers/media/usb/dvb-usb-v2/usb_urb.c
+
 DYNAMIC DEBUG
 M:      Jason Baron <jbaron@redhat.com>
 S:      Maintained
@@ -2480,6 +2639,16 @@ M:	"Maciej W. Rozycki" <macro@linux-mips.org>
 S:      Maintained
 F:      drivers/tty/serial/dz.*
 
+E4000 MEDIA DRIVER
+M:      Antti Palosaari <crope@iki.fi>
+L:      linux-media@vger.kernel.org
+W:      http://linuxtv.org/
+W:      http://palosaari.fi/linux/
+Q:      http://patchwork.linuxtv.org/project/linux-media/list/
+T:      git git://linuxtv.org/anttip/media_tree.git
+S:      Maintained
+F:      drivers/media/tuners/e4000*
+
 EATA-DMA SCSI DRIVER
 M:      Michael Neuffer <mike@i-Connect.Net>
 L:      linux-eata@i-connect.net
@@ -2508,6 +2677,16 @@ S:	Maintained
 F:      include/linux/netfilter_bridge/ebt_*.h
 F:      net/bridge/netfilter/ebt*.c
 
+EC100 MEDIA DRIVER
+M:      Antti Palosaari <crope@iki.fi>
+L:      linux-media@vger.kernel.org
+W:      http://linuxtv.org/
+W:      http://palosaari.fi/linux/
+Q:      http://patchwork.linuxtv.org/project/linux-media/list/
+T:      git git://linuxtv.org/anttip/media_tree.git
+S:      Maintained
+F:      drivers/media/dvb-frontends/ec100*
+
 ECRYPT FILE SYSTEM
 M:      Tyler Hicks <tyhicks@canonical.com>
 M:      Dustin Kirkland <dustin.kirkland@gazzang.com>
@@ -2627,6 +2806,19 @@ T:	git git://git.alsa-project.org/alsa-kernel.git
 S:      Maintained
 F:      sound/usb/misc/ua101.c
 
+EXTENSIBLE FIRMWARE INTERFACE (EFI)
+M:      Matt Fleming <matt.fleming@intel.com>
+L:      linux-efi@vger.kernel.org
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/mfleming/efi.git
+S:      Maintained
+F:      Documentation/x86/efi-stub.txt
+F:      arch/ia64/kernel/efi.c
+F:      arch/x86/boot/compressed/eboot.[ch]
+F:      arch/x86/include/asm/efi.h
+F:      arch/x86/platform/efi/*
+F:      drivers/firmware/efivars.c
+F:      include/linux/efi*.h
+
 EFIFB FRAMEBUFFER DRIVER
 L:      linux-fbdev@vger.kernel.org
 M:      Peter Jones <pjones@redhat.com>
@@ -2778,8 +2970,18 @@ FC0011 TUNER DRIVER
 M:      Michael Buesch <m@bues.ch>
 L:      linux-media@vger.kernel.org
 S:      Maintained
-F:      drivers/media/common/tuners/fc0011.h
-F:      drivers/media/common/tuners/fc0011.c
+F:      drivers/media/tuners/fc0011.h
+F:      drivers/media/tuners/fc0011.c
+
+FC2580 MEDIA DRIVER
+M:      Antti Palosaari <crope@iki.fi>
+L:      linux-media@vger.kernel.org
+W:      http://linuxtv.org/
+W:      http://palosaari.fi/linux/
+Q:      http://patchwork.linuxtv.org/project/linux-media/list/
+T:      git git://linuxtv.org/anttip/media_tree.git
+S:      Maintained
+F:      drivers/media/tuners/fc2580*
 
 FANOTIFY
 M:      Eric Paris <eparis@redhat.com>
@@ -2859,7 +3061,9 @@ F:	include/linux/firewire*.h
 F:      tools/firewire/
 
 FIRMWARE LOADER (request_firmware)
-S:      Orphan
+M:      Ming Lei <ming.lei@canonical.com>
+L:      linux-kernel@vger.kernel.org
+S:      Maintained
 F:      Documentation/firmware_class/
 F:      drivers/base/firmware*.c
 F:      include/linux/firmware.h
@@ -3007,7 +3211,7 @@ M:	Kyungmin Park <kyungmin.park@samsung.com>
 M:      Heungjun Kim <riverful.kim@samsung.com>
 L:      linux-media@vger.kernel.org
 S:      Maintained
-F:      drivers/media/video/m5mols/
+F:      drivers/media/i2c/m5mols/
 F:      include/media/m5mols.h
 
 FUJITSU TABLET EXTRAS
@@ -3105,6 +3309,7 @@ T:	git git://git.secretlab.ca/git/linux-2.6.git
 F:      Documentation/gpio.txt
 F:      drivers/gpio/
 F:      include/linux/gpio*
+F:      include/asm-generic/gpio.h
 
 GRE DEMULTIPLEXER DRIVER
 M:      Dmitry Kozlov <xeb@mail.ru>
@@ -3124,49 +3329,56 @@ M:	Frank Zago <frank@zago.net>
 L:      linux-media@vger.kernel.org
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git
 S:      Maintained
-F:      drivers/media/video/gspca/finepix.c
+F:      drivers/media/usb/gspca/finepix.c
 
 GSPCA GL860 SUBDRIVER
 M:      Olivier Lorin <o.lorin@laposte.net>
 L:      linux-media@vger.kernel.org
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git
 S:      Maintained
-F:      drivers/media/video/gspca/gl860/
+F:      drivers/media/usb/gspca/gl860/
 
 GSPCA M5602 SUBDRIVER
 M:      Erik Andren <erik.andren@gmail.com>
 L:      linux-media@vger.kernel.org
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git
 S:      Maintained
-F:      drivers/media/video/gspca/m5602/
+F:      drivers/media/usb/gspca/m5602/
 
 GSPCA PAC207 SONIXB SUBDRIVER
 M:      Hans de Goede <hdegoede@redhat.com>
 L:      linux-media@vger.kernel.org
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git
 S:      Maintained
-F:      drivers/media/video/gspca/pac207.c
+F:      drivers/media/usb/gspca/pac207.c
 
 GSPCA SN9C20X SUBDRIVER
 M:      Brian Johnson <brijohn@gmail.com>
 L:      linux-media@vger.kernel.org
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git
 S:      Maintained
-F:      drivers/media/video/gspca/sn9c20x.c
+F:      drivers/media/usb/gspca/sn9c20x.c
 
 GSPCA T613 SUBDRIVER
 M:      Leandro Costantino <lcostantino@gmail.com>
 L:      linux-media@vger.kernel.org
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git
 S:      Maintained
-F:      drivers/media/video/gspca/t613.c
+F:      drivers/media/usb/gspca/t613.c
 
 GSPCA USB WEBCAM DRIVER
 M:      Hans de Goede <hdegoede@redhat.com>
 L:      linux-media@vger.kernel.org
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git
 S:      Maintained
-F:      drivers/media/video/gspca/
+F:      drivers/media/usb/gspca/
+
+STK1160 USB VIDEO CAPTURE DRIVER
+M:      Ezequiel Garcia <elezegarcia@gmail.com>
+L:      linux-media@vger.kernel.org
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git
+S:      Maintained
+F:      drivers/media/usb/stk1160/
 
 HARD DRIVE ACTIVE PROTECTION SYSTEM (HDAPS) DRIVER
 M:      Frank Seidel <frank@f-seidel.de>
@@ -3220,6 +3432,16 @@ L:	linux-parisc@vger.kernel.org
 S:      Maintained
 F:      sound/parisc/harmony.*
 
+HD29L2 MEDIA DRIVER
+M:      Antti Palosaari <crope@iki.fi>
+L:      linux-media@vger.kernel.org
+W:      http://linuxtv.org/
+W:      http://palosaari.fi/linux/
+Q:      http://patchwork.linuxtv.org/project/linux-media/list/
+T:      git git://linuxtv.org/anttip/media_tree.git
+S:      Maintained
+F:      drivers/media/dvb-frontends/hd29l2*
+
 HEWLETT-PACKARD SMART2 RAID DRIVER
 M:      Chirag Kantharia <chirag.kantharia@hp.com>
 L:      iss_storagedev@hp.com
@@ -3388,7 +3610,7 @@ 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/
-T:      git git://git.fluff.org/bjdooks/linux.git
+T:      git git://git.pengutronix.de/git/wsa/linux.git
 S:      Maintained
 F:      Documentation/i2c/
 F:      drivers/i2c/
@@ -3420,6 +3642,18 @@ T:	git git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux.git
 S:      Maintained
 F:      arch/ia64/
 
+IBM Power in-Nest Crypto Acceleration
+M:      Kent Yoder <key@linux.vnet.ibm.com>
+L:      linux-crypto@vger.kernel.org
+S:      Supported
+F:      drivers/crypto/nx/
+
+IBM Power 842 compression accelerator
+M:      Robert Jennings <rcj@linux.vnet.ibm.com>
+S:      Supported
+F:      drivers/crypto/nx/nx-842.c
+F:      include/linux/nx842.h
+
 IBM Power Linux RAID adapter
 M:      Brian King <brking@us.ibm.com>
 S:      Supported
@@ -3431,6 +3665,13 @@ L:	netdev@vger.kernel.org
 S:      Supported
 F:      drivers/net/ethernet/ibm/ibmveth.*
 
+IBM Power Virtual SCSI/FC Device Drivers
+M:      Robert Jennings <rcj@linux.vnet.ibm.com>
+L:      linux-scsi@vger.kernel.org
+S:      Supported
+F:      drivers/scsi/ibmvscsi/
+X:      drivers/scsi/ibmvscsi/ibmvstgt.c
+
 IBM ServeRAID RAID DRIVER
 P:      Jack Hammer
 M:      Dave Jeffery <ipslinux@adaptec.com>
@@ -3552,11 +3793,12 @@ K:	\b(ABS|SYN)_MT_
 
 INTEL C600 SERIES SAS CONTROLLER DRIVER
 M:      Intel SCU Linux support <intel-linux-scu@intel.com>
+M:      Lukasz Dorau <lukasz.dorau@intel.com>
+M:      Maciej Patelczyk <maciej.patelczyk@intel.com>
 M:      Dave Jiang <dave.jiang@intel.com>
-M:      Ed Nadolski <edmund.nadolski@intel.com>
 L:      linux-scsi@vger.kernel.org
-T:      git git://git.kernel.org/pub/scm/linux/kernel/git/djbw/isci.git
-S:      Maintained
+T:      git git://git.code.sf.net/p/intel-sas/isci
+S:      Supported
 F:      drivers/scsi/isci/
 F:      firmware/isci/
 
@@ -3666,11 +3908,12 @@ F:	Documentation/networking/README.ipw2200
 F:      drivers/net/wireless/ipw2x00/
 
 INTEL(R) TRUSTED EXECUTION TECHNOLOGY (TXT)
-M:      Joseph Cihula <joseph.cihula@intel.com>
+M:      Richard L Maliszewski <richard.l.maliszewski@intel.com>
+M:      Gang Wei <gang.wei@intel.com>
 M:      Shane Wang <shane.wang@intel.com>
 L:      tboot-devel@lists.sourceforge.net
 W:      http://tboot.sourceforge.net
-T:      Mercurial http://www.bughost.org/repos.hg/tboot.hg
+T:      hg http://tboot.hg.sourceforge.net:8000/hgroot/tboot/tboot
 S:      Supported
 F:      Documentation/intel_txt.txt
 F:      include/linux/tboot.h
@@ -3865,7 +4108,7 @@ T:	git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git
 W:      http://www.ivtvdriver.org
 S:      Maintained
 F:      Documentation/video4linux/*.ivtv
-F:      drivers/media/video/ivtv/
+F:      drivers/media/pci/ivtv/
 F:      include/linux/ivtv*
 
 JC42.4 TEMPERATURE SENSOR DRIVER
@@ -4138,7 +4381,7 @@ F:	Documentation/scsi/53c700.txt
 F:      drivers/scsi/53c700*
 
 LED SUBSYSTEM
-M:      Bryan Wu <bryan.wu@canonical.com>
+M:      Bryan Wu <cooloney@gmail.com>
 M:      Richard Purdie <rpurdie@rpsys.net>
 L:      linux-leds@vger.kernel.org
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds.git
@@ -4159,6 +4402,26 @@ W:	http://legousb.sourceforge.net/
 S:      Maintained
 F:      drivers/usb/misc/legousbtower.c
 
+LG2160 MEDIA DRIVER
+M:      Michael Krufky <mkrufky@linuxtv.org>
+L:      linux-media@vger.kernel.org
+W:      http://linuxtv.org/
+W:      http://github.com/mkrufky
+Q:      http://patchwork.linuxtv.org/project/linux-media/list/
+T:      git git://linuxtv.org/mkrufky/tuners.git
+S:      Maintained
+F:      drivers/media/dvb-frontends/lg2160.*
+
+LGDT3305 MEDIA DRIVER
+M:      Michael Krufky <mkrufky@linuxtv.org>
+L:      linux-media@vger.kernel.org
+W:      http://linuxtv.org/
+W:      http://github.com/mkrufky
+Q:      http://patchwork.linuxtv.org/project/linux-media/list/
+T:      git git://linuxtv.org/mkrufky/tuners.git
+S:      Maintained
+F:      drivers/media/dvb-frontends/lgdt3305.*
+
 LGUEST
 M:      Rusty Russell <rusty@rustcorp.com.au>
 L:      lguest@lists.ozlabs.org
@@ -4561,7 +4824,7 @@ MOTION EYE VAIO PICTUREBOOK CAMERA DRIVER
 W:      http://popies.net/meye/
 S:      Orphan
 F:      Documentation/video4linux/meye.txt
-F:      drivers/media/video/meye.*
+F:      drivers/media/pci/meye/
 F:      include/linux/meye.h
 
 MOTOROLA IMX MMC/SD HOST CONTROLLER INTERFACE DRIVER
@@ -4625,6 +4888,16 @@ T:	git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git
 S:      Maintained
 F:      drivers/usb/musb/
 
+MXL5007T MEDIA DRIVER
+M:      Michael Krufky <mkrufky@linuxtv.org>
+L:      linux-media@vger.kernel.org
+W:      http://linuxtv.org/
+W:      http://github.com/mkrufky
+Q:      http://patchwork.linuxtv.org/project/linux-media/list/
+T:      git git://linuxtv.org/mkrufky/tuners.git
+S:      Maintained
+F:      drivers/media/tuners/mxl5007t.*
+
 MYRICOM MYRI-10G 10GbE DRIVER (MYRI10GE)
 M:      Andrew Gallatin <gallatin@myri.com>
 L:      netdev@vger.kernel.org
@@ -4755,6 +5028,20 @@ F:	net/ipv6/
 F:      include/net/ip*
 F:      arch/x86/net/*
 
+NETWORKING [IPSEC]
+M:      Steffen Klassert <steffen.klassert@secunet.com>
+M:      Herbert Xu <herbert@gondor.apana.org.au>
+M:      "David S. Miller" <davem@davemloft.net>
+L:      netdev@vger.kernel.org
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net.git
+S:      Maintained
+F:      net/xfrm/
+F:      net/key/
+F:      net/ipv4/xfrm*
+F:      net/ipv6/xfrm*
+F:      include/uapi/linux/xfrm.h
+F:      include/net/xfrm.h
+
 NETWORKING [LABELED] (NetLabel, CIPSO, Labeled IPsec, SECMARK)
 M:      Paul Moore <paul@paul-moore.com>
 L:      netdev@vger.kernel.org
@@ -4782,7 +5069,13 @@ T:	git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git
 S:      Odd Fixes
 F:      drivers/net/
 F:      include/linux/if_*
-F:      include/linux/*device.h
+F:      include/linux/netdevice.h
+F:      include/linux/arcdevice.h
+F:      include/linux/etherdevice.h
+F:      include/linux/fcdevice.h
+F:      include/linux/fddidevice.h
+F:      include/linux/hippidevice.h
+F:      include/linux/inetdevice.h
 
 NETXEN (1/10) GbE SUPPORT
 M:      Sony Chacko <sony.chacko@qlogic.com>
@@ -4797,6 +5090,7 @@ M:	Lauro Ramos Venancio <lauro.venancio@openbossa.org>
 M:      Aloisio Almeida Jr <aloisio.almeida@openbossa.org>
 M:      Samuel Ortiz <sameo@linux.intel.com>
 L:      linux-wireless@vger.kernel.org
+L:      linux-nfc@lists.01.org (moderated for non-subscribers)
 S:      Maintained
 F:      net/nfc/
 F:      include/linux/nfc.h
@@ -4937,8 +5231,10 @@ S:	Maintained
 F:      drivers/mmc/host/omap.c
 
 OMAP HS MMC SUPPORT
+M:      Venkatraman S <svenkatr@ti.com>
+L:      linux-mmc@vger.kernel.org
 L:      linux-omap@vger.kernel.org
-S:      Orphan
+S:      Maintained
 F:      drivers/mmc/host/omap_hsmmc.c
 
 OMAP RANDOM NUMBER GENERATOR SUPPORT
@@ -4964,7 +5260,7 @@ OMAP IMAGE SIGNAL PROCESSOR (ISP)
 M:      Laurent Pinchart <laurent.pinchart@ideasonboard.com>
 L:      linux-media@vger.kernel.org
 S:      Maintained
-F:      drivers/media/video/omap3isp/*
+F:      drivers/media/platform/omap3isp/
 
 OMAP USB SUPPORT
 M:      Felipe Balbi <balbi@ti.com>
@@ -5005,7 +5301,7 @@ M:	Jonathan Corbet <corbet@lwn.net>
 L:      linux-media@vger.kernel.org
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git
 S:      Maintained
-F:      drivers/media/video/ov7670.c
+F:      drivers/media/i2c/ov7670.c
 
 ONENAND FLASH DRIVER
 M:      Kyungmin Park <kyungmin.park@samsung.com>
@@ -5039,6 +5335,7 @@ S:	Maintained
 F:      Documentation/devicetree
 F:      drivers/of
 F:      include/linux/of*.h
+F:      scripts/dtc
 K:      of_get_property
 K:      of_match_table
 
@@ -5224,7 +5521,7 @@ F:	include/linux/i2c-algo-pca.h
 F:      include/linux/i2c-pca-platform.h
 
 PCDP - PRIMARY CONSOLE AND DEBUG PORT
-M:      Khalid Aziz <khalid.aziz@hp.com>
+M:      Khalid Aziz <khalid@gonehiking.org>
 S:      Maintained
 F:      drivers/firmware/pcdp.*
 
@@ -5320,6 +5617,12 @@ L:	linux-mtd@lists.infradead.org
 S:      Maintained
 F:      drivers/mtd/devices/phram.c
 
+PICOLCD HID DRIVER
+M:      Bruno Prémont <bonbons@linux-vserver.org>
+L:      linux-input@vger.kernel.org
+S:      Maintained
+F:      drivers/hid/hid-picolcd*
+
 PICOXCELL SUPPORT
 M:      Jamie Iles <jamie@jamieiles.com>
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@ -5501,13 +5804,25 @@ L:	cbe-oss-dev@lists.ozlabs.org
 S:      Maintained
 F:      drivers/block/ps3vram.c
 
+PSTORE FILESYSTEM
+M:      Anton Vorontsov <cbouatmailru@gmail.com>
+M:      Colin Cross <ccross@android.com>
+M:      Kees Cook <keescook@chromium.org>
+M:      Tony Luck <tony.luck@intel.com>
+S:      Maintained
+T:      git git://git.infradead.org/users/cbou/linux-pstore.git
+F:      fs/pstore/
+F:      include/linux/pstore*
+F:      drivers/firmware/efivars.c
+F:      drivers/acpi/apei/erst.c
+
 PTP HARDWARE CLOCK SUPPORT
 M:      Richard Cochran <richardcochran@gmail.com>
 S:      Maintained
 W:      http://linuxptp.sourceforge.net/
 F:      Documentation/ABI/testing/sysfs-ptp
 F:      Documentation/ptp/*
-F:      drivers/net/gianfar_ptp.c
+F:      drivers/net/ethernet/freescale/gianfar_ptp.c
 F:      drivers/net/phy/dp83640*
 F:      drivers/ptp/*
 F:      include/linux/ptp_cl*
@@ -5530,7 +5845,7 @@ W:	http://www.isely.net/pvrusb2/
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git
 S:      Maintained
 F:      Documentation/video4linux/README.pvrusb2
-F:      drivers/media/video/pvrusb2/
+F:      drivers/media/usb/pvrusb2/
 
 PWM SUBSYSTEM
 M:      Thierry Reding <thierry.reding@avionic-design.de>
@@ -5543,6 +5858,8 @@ F:	Documentation/devicetree/bindings/pwm/
 F:      include/linux/pwm.h
 F:      include/linux/of_pwm.h
 F:      drivers/pwm/
+F:      drivers/video/backlight/pwm_bl.c
+F:      include/linux/pwm_backlight.h
 
 PXA2xx/PXA3xx SUPPORT
 M:      Eric Miao <eric.y.miao@gmail.com>
@@ -5638,6 +5955,16 @@ F:	fs/qnx4/
 F:      include/linux/qnx4_fs.h
 F:      include/linux/qnxtypes.h
 
+QT1010 MEDIA DRIVER
+M:      Antti Palosaari <crope@iki.fi>
+L:      linux-media@vger.kernel.org
+W:      http://linuxtv.org/
+W:      http://palosaari.fi/linux/
+Q:      http://patchwork.linuxtv.org/project/linux-media/list/
+T:      git git://linuxtv.org/anttip/media_tree.git
+S:      Maintained
+F:      drivers/media/tuners/qt1010*
+
 QUALCOMM HEXAGON ARCHITECTURE
 M:      Richard Kuo <rkuo@codeaurora.org>
 L:      linux-hexagon@vger.kernel.org
@@ -5804,6 +6131,16 @@ F:	include/linux/rose.h
 F:      include/net/rose.h
 F:      net/rose/
 
+RTL2830 MEDIA DRIVER
+M:      Antti Palosaari <crope@iki.fi>
+L:      linux-media@vger.kernel.org
+W:      http://linuxtv.org/
+W:      http://palosaari.fi/linux/
+Q:      http://patchwork.linuxtv.org/project/linux-media/list/
+T:      git git://linuxtv.org/anttip/media_tree.git
+S:      Maintained
+F:      drivers/media/dvb-frontends/rtl2830*
+
 RTL8180 WIRELESS DRIVER
 M:      "John W. Linville" <linville@tuxdriver.com>
 L:      linux-wireless@vger.kernel.org
@@ -5898,9 +6235,9 @@ L:	linux-media@vger.kernel.org
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git
 W:      http://www.mihu.de/linux/saa7146
 S:      Maintained
-F:      drivers/media/common/saa7146*
-F:      drivers/media/video/*7146*
-F:      include/media/*7146*
+F:      drivers/media/common/saa7146/
+F:      drivers/media/pci/saa7146/
+F:      include/media/saa7146*
 
 SAMSUNG LAPTOP DRIVER
 M:      Corentin Chary <corentincj@iksaif.net>
@@ -5937,7 +6274,7 @@ S:	Maintained
 F:      drivers/tty/serial
 
 SYNOPSYS DESIGNWARE DMAC DRIVER
-M:     Viresh Kumar <viresh.linux@gmail.com>
+M:      Viresh Kumar <viresh.linux@gmail.com>
 S:      Maintained
 F:      include/linux/dw_dmac.h
 F:      drivers/dma/dw_dmac_regs.h
@@ -5961,7 +6298,7 @@ M:	Huang Shijie <shijie8@gmail.com>
 M:      Kang Yong <kangyong@telegent.com>
 M:      Zhang Xiaobing <xbzhang@telegent.com>
 S:      Supported
-F:      drivers/media/video/tlg2300
+F:      drivers/media/usb/tlg2300
 
 SC1200 WDT DRIVER
 M:      Zwane Mwaikambo <zwane@arm.linux.org.uk>
@@ -6085,7 +6422,7 @@ S:	Maintained
 F:      drivers/mmc/host/sdhci-s3c.c
 
 SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) ST SPEAR DRIVER
-M:     Viresh Kumar <viresh.linux@gmail.com>
+M:      Viresh Kumar <viresh.linux@gmail.com>
 L:      spear-devel@list.st.com
 L:      linux-mmc@vger.kernel.org
 S:      Maintained
@@ -6349,8 +6686,9 @@ M:	Guennadi Liakhovetski <g.liakhovetski@gmx.de>
 L:      linux-media@vger.kernel.org
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git
 S:      Maintained
-F:      include/media/v4l2*
-F:      drivers/media/video/v4l2*
+F:      include/media/soc*
+F:      drivers/media/i2c/soc_camera/
+F:      drivers/media/platform/soc_camera/
 
 SOEKRIS NET48XX LED SUPPORT
 M:      Chris Boot <bootc@bootc.net>
@@ -6450,7 +6788,7 @@ S:	Maintained
 F:      include/linux/compiler.h
 
 SPEAR PLATFORM SUPPORT
-M:     Viresh Kumar <viresh.linux@gmail.com>
+M:      Viresh Kumar <viresh.linux@gmail.com>
 M:      Shiraz Hashim <shiraz.hashim@st.com>
 L:      spear-devel@list.st.com
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@ -6459,7 +6797,7 @@ S:	Maintained
 F:      arch/arm/plat-spear/
 
 SPEAR13XX MACHINE SUPPORT
-M:     Viresh Kumar <viresh.linux@gmail.com>
+M:      Viresh Kumar <viresh.linux@gmail.com>
 M:      Shiraz Hashim <shiraz.hashim@st.com>
 L:      spear-devel@list.st.com
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@ -6468,7 +6806,7 @@ S:	Maintained
 F:      arch/arm/mach-spear13xx/
 
 SPEAR3XX MACHINE SUPPORT
-M:     Viresh Kumar <viresh.linux@gmail.com>
+M:      Viresh Kumar <viresh.linux@gmail.com>
 M:      Shiraz Hashim <shiraz.hashim@st.com>
 L:      spear-devel@list.st.com
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@ -6479,7 +6817,7 @@ F:	arch/arm/mach-spear3xx/
 SPEAR6XX MACHINE SUPPORT
 M:      Rajeev Kumar <rajeev-dlh.kumar@st.com>
 M:      Shiraz Hashim <shiraz.hashim@st.com>
-M:     Viresh Kumar <viresh.linux@gmail.com>
+M:      Viresh Kumar <viresh.linux@gmail.com>
 L:      spear-devel@list.st.com
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 W:      http://www.st.com/spear
@@ -6487,7 +6825,7 @@ S:	Maintained
 F:      arch/arm/mach-spear6xx/
 
 SPEAR CLOCK FRAMEWORK SUPPORT
-M:     Viresh Kumar <viresh.linux@gmail.com>
+M:      Viresh Kumar <viresh.linux@gmail.com>
 L:      spear-devel@list.st.com
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 W:      http://www.st.com/spear
@@ -6727,6 +7065,14 @@ S:	Maintained
 F:      Documentation/svga.txt
 F:      arch/x86/boot/video*
 
+SWIOTLB SUBSYSTEM
+M:      Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
+L:      linux-kernel@vger.kernel.org
+S:      Supported
+F:      lib/swiotlb.c
+F:      arch/*/kernel/pci-swiotlb.c
+F:      include/linux/swiotlb.h
+
 SYSV FILESYSTEM
 M:      Christoph Hellwig <hch@infradead.org>
 S:      Maintained
@@ -6768,6 +7114,66 @@ W:	http://tcp-lp-mod.sourceforge.net/
 S:      Maintained
 F:      net/ipv4/tcp_lp.c
 
+TDA10071 MEDIA DRIVER
+M:      Antti Palosaari <crope@iki.fi>
+L:      linux-media@vger.kernel.org
+W:      http://linuxtv.org/
+W:      http://palosaari.fi/linux/
+Q:      http://patchwork.linuxtv.org/project/linux-media/list/
+T:      git git://linuxtv.org/anttip/media_tree.git
+S:      Maintained
+F:      drivers/media/dvb-frontends/tda10071*
+
+TDA18212 MEDIA DRIVER
+M:      Antti Palosaari <crope@iki.fi>
+L:      linux-media@vger.kernel.org
+W:      http://linuxtv.org/
+W:      http://palosaari.fi/linux/
+Q:      http://patchwork.linuxtv.org/project/linux-media/list/
+T:      git git://linuxtv.org/anttip/media_tree.git
+S:      Maintained
+F:      drivers/media/tuners/tda18212*
+
+TDA18218 MEDIA DRIVER
+M:      Antti Palosaari <crope@iki.fi>
+L:      linux-media@vger.kernel.org
+W:      http://linuxtv.org/
+W:      http://palosaari.fi/linux/
+Q:      http://patchwork.linuxtv.org/project/linux-media/list/
+T:      git git://linuxtv.org/anttip/media_tree.git
+S:      Maintained
+F:      drivers/media/tuners/tda18218*
+
+TDA18271 MEDIA DRIVER
+M:      Michael Krufky <mkrufky@linuxtv.org>
+L:      linux-media@vger.kernel.org
+W:      http://linuxtv.org/
+W:      http://github.com/mkrufky
+Q:      http://patchwork.linuxtv.org/project/linux-media/list/
+T:      git git://linuxtv.org/mkrufky/tuners.git
+S:      Maintained
+F:      drivers/media/tuners/tda18271*
+
+TDA827x MEDIA DRIVER
+M:      Michael Krufky <mkrufky@linuxtv.org>
+L:      linux-media@vger.kernel.org
+W:      http://linuxtv.org/
+W:      http://github.com/mkrufky
+Q:      http://patchwork.linuxtv.org/project/linux-media/list/
+T:      git git://linuxtv.org/mkrufky/tuners.git
+S:      Maintained
+F:      drivers/media/tuners/tda8290.*
+
+TDA8290 MEDIA DRIVER
+M:      Michael Krufky <mkrufky@linuxtv.org>
+L:      linux-media@vger.kernel.org
+W:      http://linuxtv.org/
+W:      http://github.com/mkrufky
+Q:      http://patchwork.linuxtv.org/project/linux-media/list/
+T:      git git://linuxtv.org/mkrufky/tuners.git
+S:      Maintained
+F:      drivers/media/tuners/tda8290.*
+
 TEAM DRIVER
 M:      Jiri Pirko <jpirko@redhat.com>
 L:      netdev@vger.kernel.org
@@ -6776,14 +7182,14 @@ F:	drivers/net/team/
 F:      include/linux/if_team.h
 
 TEGRA SUPPORT
-M:      Colin Cross <ccross@android.com>
-M:      Olof Johansson <olof@lixom.net>
 M:      Stephen Warren <swarren@wwwdotorg.org>
 L:      linux-tegra@vger.kernel.org
 Q:      http://patchwork.ozlabs.org/project/linux-tegra/list/
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra.git
 S:      Supported
 F:      arch/arm/mach-tegra
+F:      arch/arm/boot/dts/tegra*
+F:      arch/arm/configs/tegra_defconfig
 
 TEHUTI ETHERNET DRIVER
 M:      Andy Gospodarek <andy@greyhouse.net>
@@ -6798,6 +7204,8 @@ F:	drivers/char/tlclk.c
 
 TENSILICA XTENSA PORT (xtensa)
 M:      Chris Zankel <chris@zankel.net>
+M:      Max Filippov <jcmvbkbc@gmail.com>
+L:      linux-xtensa@linux-xtensa.org
 S:      Maintained
 F:      arch/xtensa/
 
@@ -6958,6 +7366,16 @@ F:	include/linux/serial_core.h
 F:      include/linux/serial.h
 F:      include/linux/tty.h
 
+TUA9001 MEDIA DRIVER
+M:      Antti Palosaari <crope@iki.fi>
+L:      linux-media@vger.kernel.org
+W:      http://linuxtv.org/
+W:      http://palosaari.fi/linux/
+Q:      http://patchwork.linuxtv.org/project/linux-media/list/
+T:      git git://linuxtv.org/anttip/media_tree.git
+S:      Maintained
+F:      drivers/media/tuners/tua9001*
+
 TULIP NETWORK DRIVERS
 M:      Grant Grundler <grundler@parisc-linux.org>
 L:      netdev@vger.kernel.org
@@ -7075,6 +7493,12 @@ F:	drivers/mtd/ubi/
 F:      include/linux/mtd/ubi.h
 F:      include/mtd/ubi-user.h
 
+UNSORTED BLOCK IMAGES (UBI) Fastmap
+M:      Richard Weinberger <richard@nod.at>
+L:      linux-mtd@lists.infradead.org
+S:      Maintained
+F:      drivers/mtd/ubi/fastmap.c
+
 USB ACM DRIVER
 M:      Oliver Neukum <oliver@neukum.org>
 L:      linux-usb@vger.kernel.org
@@ -7130,15 +7554,6 @@ S:	Maintained
 F:      Documentation/usb/ehci.txt
 F:      drivers/usb/host/ehci*
 
-USB ET61X[12]51 DRIVER
-M:      Luca Risolia <luca.risolia@studio.unibo.it>
-L:      linux-usb@vger.kernel.org
-L:      linux-media@vger.kernel.org
-T:      git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git
-W:      http://www.linux-projects.org
-S:      Maintained
-F:      drivers/media/video/et61x251/
-
 USB GADGET/PERIPHERAL SUBSYSTEM
 M:      Felipe Balbi <balbi@ti.com>
 L:      linux-usb@vger.kernel.org
@@ -7308,7 +7723,7 @@ T:	git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git
 W:      http://www.linux-projects.org
 S:      Maintained
 F:      Documentation/video4linux/sn9c102.txt
-F:      drivers/media/video/sn9c102/
+F:      drivers/media/usb/sn9c102/
 
 USB SUBSYSTEM
 M:      Greg Kroah-Hartman <gregkh@linuxfoundation.org>
@@ -7343,17 +7758,14 @@ L:	linux-media@vger.kernel.org
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git
 W:      http://www.ideasonboard.org/uvc/
 S:      Maintained
-F:      drivers/media/video/uvc/
+F:      drivers/media/usb/uvc/
 
-USB W996[87]CF DRIVER
-M:      Luca Risolia <luca.risolia@studio.unibo.it>
+USB WEBCAM GADGET
+M:      Laurent Pinchart <laurent.pinchart@ideasonboard.com>
 L:      linux-usb@vger.kernel.org
-L:      linux-media@vger.kernel.org
-T:      git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git
-W:      http://www.linux-projects.org
 S:      Maintained
-F:      Documentation/video4linux/w9968cf.txt
-F:      drivers/media/video/w996*
+F:      drivers/usb/gadget/*uvc*.c
+F:      drivers/usb/gadget/webcam.c
 
 USB WIRELESS RNDIS DRIVER (rndis_wlan)
 M:      Jussi Kivilinna <jussi.kivilinna@mbnet.fi>
@@ -7382,7 +7794,7 @@ T:	git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git
 W:      http://royale.zerezo.com/zr364xx/
 S:      Maintained
 F:      Documentation/video4linux/zr364xx.txt
-F:      drivers/media/video/zr364xx.c
+F:      drivers/media/usb/zr364xx/
 
 USER-MODE LINUX (UML)
 M:      Jeff Dike <jdike@addtoit.com>
@@ -7440,7 +7852,7 @@ M:	Marek Szyprowski <m.szyprowski@samsung.com>
 M:      Kyungmin Park <kyungmin.park@samsung.com>
 L:      linux-media@vger.kernel.org
 S:      Maintained
-F:      drivers/media/video/videobuf2-*
+F:      drivers/media/v4l2-core/videobuf2-*
 F:      include/media/videobuf2-*
 
 VIRTIO CONSOLE DRIVER
@@ -7752,6 +8164,13 @@ F:	drivers/xen/
 F:      arch/x86/include/asm/xen/
 F:      include/xen/
 
+XEN HYPERVISOR ARM
+M:      Stefano Stabellini <stefano.stabellini@eu.citrix.com>
+L:      xen-devel@lists.xensource.com (moderated for non-subscribers)
+S:      Supported
+F:      arch/arm/xen/
+F:      arch/arm/include/asm/xen/
+
 XEN NETWORK BACKEND DRIVER
 M:      Ian Campbell <ian.campbell@citrix.com>
 L:      xen-devel@lists.xensource.com (moderated for non-subscribers)
@@ -7842,7 +8261,7 @@ L:	linux-media@vger.kernel.org
 W:      http://mjpeg.sourceforge.net/driver-zoran/
 T:      Mercurial http://linuxtv.org/hg/v4l-dvb
 S:      Odd Fixes
-F:      drivers/media/video/zoran/
+F:      drivers/media/pci/zoran/
 
 ZS DECSTATION Z85C30 SERIAL DRIVER
 M:      "Maciej W. Rozycki" <macro@linux-mips.org>