1 files changed, 296 insertions, 54 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 65e26d844a7e..b95ae9b07121 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -337,6 +337,13 @@ W:	http://wireless.kernel.org/
 S:      Orphan
 F:      drivers/net/wireless/adm8211.*
 
+ADP1653 FLASH CONTROLLER DRIVER
+M:      Sakari Ailus <sakari.ailus@iki.fi>
+L:      linux-media@vger.kernel.org
+S:      Maintained
+F:      drivers/media/i2c/adp1653.c
+F:      include/media/adp1653.h
+
 ADP5520 BACKLIGHT DRIVER WITH IO EXPANDER (ADP5520/ADP5501)
 M:      Michael Hennerich <michael.hennerich@analog.com>
 L:      device-drivers-devel@blackfin.uclinux.org
@@ -685,6 +692,12 @@ M:	Lennert Buytenhek <kernel@wantstofly.org>
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:      Maintained
 
+ARM/Allwinner A1X SoC support
+M:      Maxime Ripard <maxime.ripard@free-electrons.com>
+L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+S:      Maintained
+F:      arch/arm/mach-sunxi/
+
 ARM/ATMEL AT91RM9200 AND AT91SAM ARM ARCHITECTURES
 M:      Andrew Victor <linux@maxim.org.za>
 M:      Nicolas Ferre <nicolas.ferre@atmel.com>
@@ -707,6 +720,12 @@ S:	Maintained
 F:      arch/arm/mach-cns3xxx/
 T:      git git://git.infradead.org/users/cbou/linux-cns3xxx.git
 
+ARM/CIRRUS LOGIC CLPS711X ARM ARCHITECTURE
+M:      Alexander Shiyan <shc_work@mail.ru>
+L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+S:      Odd Fixes
+F:      arch/arm/mach-clps711x/
+
 ARM/CIRRUS LOGIC EP93XX ARM ARCHITECTURE
 M:      Hartley Sweeten <hsweeten@visionengravers.com>
 M:      Ryan Mallon <rmallon@gmail.com>
@@ -797,7 +816,6 @@ L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 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
@@ -1130,12 +1148,12 @@ S:	Maintained
 F:      drivers/media/platform/s5p-tv/
 
 ARM/SHMOBILE ARM ARCHITECTURE
-M:      Paul Mundt <lethal@linux-sh.org>
+M:      Simon Horman <horms@verge.net.au>
 M:      Magnus Damm <magnus.damm@gmail.com>
 L:      linux-sh@vger.kernel.org
 W:      http://oss.renesas.com
 Q:      http://patchwork.kernel.org/project/linux-sh/list/
-T:      git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.git rmobile-latest
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git next
 S:      Supported
 F:      arch/arm/mach-shmobile/
 F:      drivers/sh/
@@ -1237,6 +1255,7 @@ F:	drivers/video/wm8505fb*
 F:      drivers/video/wmt_ge_rops.*
 F:      drivers/tty/serial/vt8500_serial.c
 F:      drivers/rtc/rtc-vt8500-c
+F:      drivers/mmc/host/wmt-sdmmc.c
 
 ARM/ZIPIT Z2 SUPPORT
 M:      Marek Vasut <marek.vasut@gmail.com>
@@ -1247,9 +1266,11 @@ F:	arch/arm/mach-pxa/include/mach/z2.h
 
 ARM64 PORT (AARCH64 ARCHITECTURE)
 M:      Catalin Marinas <catalin.marinas@arm.com>
+M:      Will Deacon <will.deacon@arm.com>
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:      Maintained
 F:      arch/arm64/
+F:      Documentation/arm64/
 
 ASC7621 HARDWARE MONITOR DRIVER
 M:      George Joseph <george.joseph@fairview5.com>
@@ -1368,14 +1389,6 @@ S:	Maintained
 F:      drivers/atm/
 F:      include/linux/atm*
 
-ATMEL AT91 MCI DRIVER
-M:      Ludovic Desroches <ludovic.desroches@atmel.com>
-L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
-W:      http://www.atmel.com/products/AT91/
-W:      http://www.at91.com/
-S:      Maintained
-F:      drivers/mmc/host/at91_mci.c
-
 ATMEL AT91 / AT32 MCI DRIVER
 M:      Ludovic Desroches <ludovic.desroches@atmel.com>
 S:      Maintained
@@ -1488,6 +1501,14 @@ F:	include/linux/ax25.h
 F:      include/net/ax25.h
 F:      net/ax25/
 
+AZ6007 DVB DRIVER
+M:      Mauro Carvalho Chehab <mchehab@redhat.com>
+L:      linux-media@vger.kernel.org
+W:      http://linuxtv.org
+T:      git git://linuxtv.org/media_tree.git
+S:      Maintained
+F:      drivers/media/usb/dvb-usb-v2/az6007.c
+
 B43 WIRELESS DRIVER
 M:      Stefano Brivio <stefano.brivio@polimi.it>
 L:      linux-wireless@vger.kernel.org
@@ -1674,10 +1695,9 @@ F:	drivers/net/ethernet/broadcom/tg3.*
 
 BROADCOM BRCM80211 IEEE802.11n WIRELESS DRIVER
 M:      Brett Rudley <brudley@broadcom.com>
-M:      Roland Vossen <rvossen@broadcom.com>
 M:      Arend van Spriel <arend@broadcom.com>
 M:      Franky (Zhenhui) Lin <frankyl@broadcom.com>
-M:      Kan Yan <kanyan@broadcom.com>
+M:      Hante Meuleman <meuleman@broadcom.com>
 L:      linux-wireless@vger.kernel.org
 L:      brcm80211-dev-list@broadcom.com
 S:      Supported
@@ -1740,11 +1760,11 @@ F:	Documentation/filesystems/btrfs.txt
 F:      fs/btrfs/
 
 BTTV VIDEO4LINUX DRIVER
-M:      Mauro Carvalho Chehab <mchehab@infradead.org>
+M:      Mauro Carvalho Chehab <mchehab@redhat.com>
 L:      linux-media@vger.kernel.org
 W:      http://linuxtv.org
-T:      git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git
-S:      Maintained
+T:      git git://linuxtv.org/media_tree.git
+S:      Odd fixes
 F:      Documentation/video4linux/bttv/
 F:      drivers/media/pci/bt8xx/bttv*
 
@@ -1773,7 +1793,7 @@ F:	fs/cachefiles/
 CAFE CMOS INTEGRATED CAMERA CONTROLLER DRIVER
 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
+T:      git git://linuxtv.org/media_tree.git
 S:      Maintained
 F:      Documentation/video4linux/cafe_ccic
 F:      drivers/media/platform/marvell-ccic/
@@ -1994,7 +2014,6 @@ F:	fs/coda/
 F:      include/linux/coda*.h
 
 COMMON CLK FRAMEWORK
-M:      Mike Turquette <mturquette@ti.com>
 M:      Mike Turquette <mturquette@linaro.org>
 L:      linux-arm-kernel@lists.infradead.org (same as CLK API & CLKDEV)
 T:      git git://git.linaro.org/people/mturquette/linux.git
@@ -2160,12 +2179,22 @@ CX18 VIDEO4LINUX DRIVER
 M:      Andy Walls <awalls@md.metrocast.net>
 L:      ivtv-devel@ivtvdriver.org (moderated for non-subscribers)
 L:      linux-media@vger.kernel.org
-T:      git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git
+T:      git git://linuxtv.org/media_tree.git
 W:      http://linuxtv.org
 W:      http://www.ivtvdriver.org/index.php/Cx18
 S:      Maintained
 F:      Documentation/video4linux/cx18.txt
 F:      drivers/media/pci/cx18/
+F:      include/uapi/linux/ivtv*
+
+CX88 VIDEO4LINUX DRIVER
+M:      Mauro Carvalho Chehab <mchehab@redhat.com>
+L:      linux-media@vger.kernel.org
+W:      http://linuxtv.org
+T:      git git://linuxtv.org/media_tree.git
+S:      Odd fixes
+F:      Documentation/video4linux/cx88/
+F:      drivers/media/pci/cx88/
 
 CXD2820R MEDIA DRIVER
 M:      Antti Palosaari <crope@iki.fi>
@@ -2722,6 +2751,15 @@ W:	bluesmoke.sourceforge.net
 S:      Maintained
 F:      drivers/edac/amd64_edac*
 
+EDAC-CAVIUM
+M:      Ralf Baechle <ralf@linux-mips.org>
+M:      David Daney <david.daney@cavium.com>
+L:      linux-edac@vger.kernel.org
+L:      linux-mips@linux-mips.org
+W:      bluesmoke.sourceforge.net
+S:      Supported
+F:      drivers/edac/octeon_edac*
+
 EDAC-E752X
 M:      Mark Gross <mark.gross@intel.com>
 M:      Doug Thompson <dougthompson@xmission.com>
@@ -2852,6 +2890,14 @@ L:	netdev@vger.kernel.org
 S:      Maintained
 F:      drivers/net/ethernet/ibm/ehea/
 
+EM28XX VIDEO4LINUX DRIVER
+M:      Mauro Carvalho Chehab <mchehab@redhat.com>
+L:      linux-media@vger.kernel.org
+W:      http://linuxtv.org
+T:      git git://linuxtv.org/media_tree.git
+S:      Maintained
+F:      drivers/media/usb/em28xx/
+
 EMBEDDED LINUX
 M:      Paul Gortmaker <paul.gortmaker@windriver.com>
 M:      Matt Mackall <mpm@selenic.com>
@@ -3050,6 +3096,14 @@ T:	git git://git.alsa-project.org/alsa-kernel.git
 S:      Maintained
 F:      sound/firewire/
 
+FIREWIRE MEDIA DRIVERS (firedtv)
+M:      Stefan Richter <stefanr@s5r6.in-berlin.de>
+L:      linux-media@vger.kernel.org
+L:      linux1394-devel@lists.sourceforge.net
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git
+S:      Maintained
+F:      drivers/media/firewire/
+
 FIREWIRE SBP-2 TARGET
 M:      Chris Boot <bootc@bootc.net>
 L:      linux-scsi@vger.kernel.org
@@ -3336,56 +3390,56 @@ F:	drivers/net/ethernet/aeroflex/
 GSPCA FINEPIX SUBDRIVER
 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
+T:      git git://linuxtv.org/media_tree.git
 S:      Maintained
 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
+T:      git git://linuxtv.org/media_tree.git
 S:      Maintained
 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
+T:      git git://linuxtv.org/media_tree.git
 S:      Maintained
 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
+T:      git git://linuxtv.org/media_tree.git
 S:      Maintained
 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
+T:      git git://linuxtv.org/media_tree.git
 S:      Maintained
 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
+T:      git git://linuxtv.org/media_tree.git
 S:      Maintained
 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
+T:      git git://linuxtv.org/media_tree.git
 S:      Maintained
 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
+T:      git git://linuxtv.org/media_tree.git
 S:      Maintained
 F:      drivers/media/usb/stk1160/
 
@@ -3592,7 +3646,7 @@ S:	Maintained
 F:      drivers/input/touchscreen/htcpen.c
 
 HUGETLB FILESYSTEM
-M:      William Irwin <wli@holomorphy.com>
+M:      Nadia Yvette Chambers <nyc@holomorphy.com>
 S:      Maintained
 F:      fs/hugetlbfs/
 
@@ -3604,7 +3658,6 @@ S:	Maintained
 F:      drivers/hv/
 F:      drivers/hid/hid-hyperv.c
 F:      drivers/net/hyperv/
-F:      drivers/staging/hv/
 
 I2C OVER PARALLEL PORT
 M:      Jean Delvare <khali@linux-fr.org>
@@ -3784,6 +3837,12 @@ F:	net/ieee802154/
 F:      net/mac802154/
 F:      drivers/ieee802154/
 
+IGUANAWORKS USB IR TRANSCEIVER
+M:      Sean Young <sean@mess.org>
+L:      linux-media@vger.kernel.org
+S:      Maintained
+F:      drivers/media/rc/iguanair.c
+
 IIO SUBSYSTEM AND DRIVERS
 M:      Jonathan Cameron <jic23@cam.ac.uk>
 L:      linux-iio@vger.kernel.org
@@ -3797,6 +3856,15 @@ M:	Stanislaw Gruszka <stf_xl@wp.pl>
 S:      Maintained
 F:      drivers/usb/atm/ueagle-atm.c
 
+INDUSTRY PACK SUBSYSTEM (IPACK)
+M:      Samuel Iglesias Gonsalvez <siglesias@igalia.com>
+M:      Jens Taprogge <jens.taprogge@taprogge.org>
+M:      Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+L:      industrypack-devel@lists.sourceforge.net
+W:      http://industrypack.sourceforge.net
+S:      Maintained
+F:      drivers/ipack/
+
 INTEGRITY MEASUREMENT ARCHITECTURE (IMA)
 M:      Mimi Zohar <zohar@us.ibm.com>
 S:      Supported
@@ -3936,7 +4004,9 @@ M:	Greg Rose <gregory.v.rose@intel.com>
 M:      Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
 M:      Alex Duyck <alexander.h.duyck@intel.com>
 M:      John Ronciak <john.ronciak@intel.com>
+M:      Tushar Dave <tushar.n.dave@intel.com>
 L:      e1000-devel@lists.sourceforge.net
+W:      http://www.intel.com/support/feedback.htm
 W:      http://e1000.sourceforge.net/
 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
@@ -4158,17 +4228,41 @@ S:	Maintained
 F:      Documentation/hwmon/it87
 F:      drivers/hwmon/it87.c
 
+IT913X MEDIA DRIVER
+M:      Malcolm Priestley <tvboxspy@gmail.com>
+L:      linux-media@vger.kernel.org
+W:      http://linuxtv.org/
+Q:      http://patchwork.linuxtv.org/project/linux-media/list/
+S:      Maintained
+F:      drivers/media/usb/dvb-usb-v2/it913x*
+
+IT913X FE MEDIA DRIVER
+M:      Malcolm Priestley <tvboxspy@gmail.com>
+L:      linux-media@vger.kernel.org
+W:      http://linuxtv.org/
+Q:      http://patchwork.linuxtv.org/project/linux-media/list/
+S:      Maintained
+F:      drivers/media/dvb-frontends/it913x-fe*
+
 IVTV VIDEO4LINUX DRIVER
 M:      Andy Walls <awalls@md.metrocast.net>
 L:      ivtv-devel@ivtvdriver.org (moderated for non-subscribers)
 L:      linux-media@vger.kernel.org
-T:      git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git
+T:      git git://linuxtv.org/media_tree.git
 W:      http://www.ivtvdriver.org
 S:      Maintained
 F:      Documentation/video4linux/*.ivtv
 F:      drivers/media/pci/ivtv/
 F:      include/linux/ivtv*
 
+IX2505V MEDIA DRIVER
+M:      Malcolm Priestley <tvboxspy@gmail.com>
+L:      linux-media@vger.kernel.org
+W:      http://linuxtv.org/
+Q:      http://patchwork.linuxtv.org/project/linux-media/list/
+S:      Maintained
+F:      drivers/media/dvb-frontends/ix2505v*
+
 JC42.4 TEMPERATURE SENSOR DRIVER
 M:      Guenter Roeck <linux@roeck-us.net>
 L:      lm-sensors@lm-sensors.org
@@ -4300,10 +4394,10 @@ F:	include/linux/kvm*
 F:      virt/kvm/
 
 KERNEL VIRTUAL MACHINE (KVM) FOR AMD-V
-M:      Joerg Roedel <joerg.roedel@amd.com>
+M:      Joerg Roedel <joro@8bytes.org>
 L:      kvm@vger.kernel.org
 W:      http://kvm.qumranet.com
-S:      Supported
+S:      Maintained
 F:      arch/x86/include/asm/svm.h
 F:      arch/x86/kvm/svm.c
 
@@ -4311,6 +4405,7 @@ KERNEL VIRTUAL MACHINE (KVM) FOR POWERPC
 M:      Alexander Graf <agraf@suse.de>
 L:      kvm-ppc@vger.kernel.org
 W:      http://kvm.qumranet.com
+T:      git git://github.com/agraf/linux-2.6.git
 S:      Supported
 F:      arch/powerpc/include/asm/kvm*
 F:      arch/powerpc/kvm/
@@ -4613,6 +4708,14 @@ S:	Maintained
 F:      Documentation/hwmon/lm90
 F:      drivers/hwmon/lm90.c
 
+LME2510 MEDIA DRIVER
+M:      Malcolm Priestley <tvboxspy@gmail.com>
+L:      linux-media@vger.kernel.org
+W:      http://linuxtv.org/
+Q:      http://patchwork.linuxtv.org/project/linux-media/list/
+S:      Maintained
+F:      drivers/media/usb/dvb-usb-v2/lmedm04*
+
 LOCKDEP AND LOCKSTAT
 M:      Peter Zijlstra <peterz@infradead.org>
 M:      Ingo Molnar <mingo@redhat.com>
@@ -4640,13 +4743,16 @@ S:	Maintained
 F:      fs/logfs/
 
 LSILOGIC MPT FUSION DRIVERS (FC/SAS/SPI)
-M:      Eric Moore <Eric.Moore@lsi.com>
+M:      Nagalakshmi Nandigama <Nagalakshmi.Nandigama@lsi.com>
+M:      Sreekanth Reddy <Sreekanth.Reddy@lsi.com>
 M:      support@lsi.com
 L:      DL-MPTFusionLinux@lsi.com
 L:      linux-scsi@vger.kernel.org
 W:      http://www.lsilogic.com/support
 S:      Supported
 F:      drivers/message/fusion/
+F:      drivers/scsi/mpt2sas/
+F:      drivers/scsi/mpt3sas/
 
 LSILOGIC/SYMBIOS/NCR 53C8XX and 53C1010 PCI-SCSI drivers
 M:      Matthew Wilcox <matthew@wil.cx>
@@ -4703,6 +4809,14 @@ W:	http://www.tazenda.demon.co.uk/phil/linux-hp
 S:      Maintained
 F:      arch/m68k/hp300/
 
+M88RS2000 MEDIA DRIVER
+M:      Malcolm Priestley <tvboxspy@gmail.com>
+L:      linux-media@vger.kernel.org
+W:      http://linuxtv.org/
+Q:      http://patchwork.linuxtv.org/project/linux-media/list/
+S:      Maintained
+F:      drivers/media/dvb-frontends/m88rs2000*
+
 MAC80211
 M:      Johannes Berg <johannes@sipsolutions.net>
 L:      linux-wireless@vger.kernel.org
@@ -4801,12 +4915,12 @@ F:	Documentation/hwmon/max6650
 F:      drivers/hwmon/max6650.c
 
 MEDIA INPUT INFRASTRUCTURE (V4L/DVB)
-M:      Mauro Carvalho Chehab <mchehab@infradead.org>
+M:      Mauro Carvalho Chehab <mchehab@redhat.com>
 P:      LinuxTV.org Project
 L:      linux-media@vger.kernel.org
 W:      http://linuxtv.org
 Q:      http://patchwork.kernel.org/project/linux-media/list/
-T:      git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git
+T:      git git://linuxtv.org/media_tree.git
 S:      Maintained
 F:      Documentation/dvb/
 F:      Documentation/video4linux/
@@ -4814,8 +4928,13 @@ F:	Documentation/DocBook/media/
 F:      drivers/media/
 F:      drivers/staging/media/
 F:      include/media/
-F:      include/linux/dvb/
-F:      include/linux/videodev*.h
+F:      include/uapi/linux/dvb/
+F:      include/uapi/linux/videodev2.h
+F:      include/uapi/linux/media.h
+F:      include/uapi/linux/v4l2-*
+F:      include/uapi/linux/meye.h
+F:      include/uapi/linux/ivtv*
+F:      include/uapi/linux/uvcvideo.h
 
 MEGARAID SCSI DRIVERS
 M:      Neela Syam Kolli <megaraidlinux@lsi.com>
@@ -4826,6 +4945,14 @@ F:	Documentation/scsi/megaraid.txt
 F:      drivers/scsi/megaraid.*
 F:      drivers/scsi/megaraid/
 
+MELLANOX ETHERNET DRIVER (mlx4_en)
+M:      Amir Vadai <amirv@mellanox.com>
+L:      netdev@vger.kernel.org
+S:      Supported
+W:      http://www.mellanox.com
+Q:      http://patchwork.ozlabs.org/project/netdev/list/
+F:      drivers/net/ethernet/mellanox/mlx4/en_*
+
 MEMORY MANAGEMENT
 L:      linux-mm@kvack.org
 W:      http://www.linux-mm.org
@@ -4889,7 +5016,7 @@ W:	http://popies.net/meye/
 S:      Orphan
 F:      Documentation/video4linux/meye.txt
 F:      drivers/media/pci/meye/
-F:      include/linux/meye.h
+F:      include/uapi/linux/meye.h
 
 MOTOROLA IMX MMC/SD HOST CONTROLLER INTERFACE DRIVER
 M:      Pavel Pisa <ppisa@pikron.com>
@@ -4903,6 +5030,13 @@ S:	Maintained
 F:      Documentation/serial/moxa-smartio
 F:      drivers/tty/mxser.*
 
+MR800 AVERMEDIA USB FM RADIO DRIVER
+M:      Alexey Klimov <klimov.linux@gmail.com>
+L:      linux-media@vger.kernel.org
+T:      git git://linuxtv.org/media_tree.git
+S:      Maintained
+F:      drivers/media/radio/radio-mr800.c
+
 MSI LAPTOP SUPPORT
 M:      "Lee, Chun-Yi" <jlee@novell.com>
 L:      platform-driver-x86@vger.kernel.org
@@ -5068,7 +5202,7 @@ NETWORKING [GENERAL]
 M:      "David S. Miller" <davem@davemloft.net>
 L:      netdev@vger.kernel.org
 W:      http://www.linuxfoundation.org/en/Net
-W:      http://patchwork.ozlabs.org/project/netdev/list/
+Q:      http://patchwork.ozlabs.org/project/netdev/list/
 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
@@ -5128,6 +5262,7 @@ F:	drivers/net/wireless/
 NETWORKING DRIVERS
 L:      netdev@vger.kernel.org
 W:      http://www.linuxfoundation.org/en/Net
+Q:      http://patchwork.ozlabs.org/project/netdev/list/
 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:      Odd Fixes
@@ -5160,6 +5295,7 @@ F:	net/nfc/
 F:      include/linux/nfc.h
 F:      include/net/nfc/
 F:      drivers/nfc/
+F:      include/linux/platform_data/pn544.h
 
 NFS, SUNRPC, AND LOCKD CLIENTS
 M:      Trond Myklebust <Trond.Myklebust@netapp.com>
@@ -5363,7 +5499,7 @@ F:	drivers/char/pcmcia/cm4040_cs.*
 OMNIVISION OV7670 SENSOR DRIVER
 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
+T:      git git://linuxtv.org/media_tree.git
 S:      Maintained
 F:      drivers/media/i2c/ov7670.c
 
@@ -5702,6 +5838,12 @@ S:	Maintained
 F:      drivers/pinctrl/
 F:      include/linux/pinctrl/
 
+PIN CONTROLLER - ATMEL AT91
+M:      Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>
+L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+S:      Maintained
+F:      drivers/pinctrl/pinctrl-at91.c
+
 PIN CONTROLLER - ST SPEAR
 M:      Viresh Kumar <viresh.linux@gmail.com>
 L:      spear-devel@list.st.com
@@ -5906,11 +6048,18 @@ M:	Mike Isely <isely@pobox.com>
 L:      pvrusb2@isely.net       (subscribers-only)
 L:      linux-media@vger.kernel.org
 W:      http://www.isely.net/pvrusb2/
-T:      git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git
+T:      git git://linuxtv.org/media_tree.git
 S:      Maintained
 F:      Documentation/video4linux/README.pvrusb2
 F:      drivers/media/usb/pvrusb2/
 
+PWC WEBCAM DRIVER
+M:      Hans de Goede <hdegoede@redhat.com>
+L:      linux-media@vger.kernel.org
+T:      git git://linuxtv.org/media_tree.git
+S:      Maintained
+F:      drivers/media/usb/pwc/*
+
 PWM SUBSYSTEM
 M:      Thierry Reding <thierry.reding@avionic-design.de>
 L:      linux-kernel@vger.kernel.org
@@ -6053,6 +6202,21 @@ S:	Maintained
 F:      drivers/video/aty/radeon*
 F:      include/linux/radeonfb.h
 
+RADIOSHARK RADIO DRIVER
+M:      Hans de Goede <hdegoede@redhat.com>
+L:      linux-media@vger.kernel.org
+T:      git git://linuxtv.org/media_tree.git
+S:      Maintained
+F:      drivers/media/radio/radio-shark.c
+
+RADIOSHARK2 RADIO DRIVER
+M:      Hans de Goede <hdegoede@redhat.com>
+L:      linux-media@vger.kernel.org
+T:      git git://linuxtv.org/media_tree.git
+S:      Maintained
+F:      drivers/media/radio/radio-shark2.c
+F:      drivers/media/radio/radio-tea5777.c
+
 RAGE128 FRAMEBUFFER DISPLAY DRIVER
 M:      Paul Mackerras <paulus@samba.org>
 L:      linux-fbdev@vger.kernel.org
@@ -6293,10 +6457,19 @@ L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:      Supported
 F:      drivers/mmc/host/s3cmci.*
 
+SAA7134 VIDEO4LINUX DRIVER
+M:      Mauro Carvalho Chehab <mchehab@redhat.com>
+L:      linux-media@vger.kernel.org
+W:      http://linuxtv.org
+T:      git git://linuxtv.org/media_tree.git
+S:      Odd fixes
+F:      Documentation/video4linux/saa7134/
+F:      drivers/media/pci/saa7134/
+
 SAA7146 VIDEO4LINUX-2 DRIVER
 M:      Michael Hunold <michael@mihu.de>
 L:      linux-media@vger.kernel.org
-T:      git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git
+T:      git git://linuxtv.org/media_tree.git
 W:      http://www.mihu.de/linux/saa7146
 S:      Maintained
 F:      drivers/media/common/saa7146/
@@ -6331,6 +6504,14 @@ F:	drivers/regulator/s5m*.c
 F:      drivers/rtc/rtc-sec.c
 F:      include/linux/mfd/samsung/
 
+SAMSUNG S3C24XX/S3C64XX SOC SERIES CAMIF DRIVER
+M:      Sylwester Nawrocki <sylvester.nawrocki@gmail.com>
+L:      linux-media@vger.kernel.org
+L:      linux-samsung-soc@vger.kernel.org (moderated for non-subscribers)
+S:      Maintained
+F:      drivers/media/platform/s3c-camif/
+F:      include/media/s3c_camif.h
+
 SERIAL DRIVERS
 M:      Alan Cox <alan@linux.intel.com>
 L:      linux-serial@vger.kernel.org
@@ -6429,6 +6610,7 @@ F:	drivers/scsi/st*
 SCTP PROTOCOL
 M:      Vlad Yasevich <vyasevich@gmail.com>
 M:      Sridhar Samudrala <sri@us.ibm.com>
+M:      Neil Horman <nhorman@tuxdriver.com>
 L:      linux-sctp@vger.kernel.org
 W:      http://lksctp.sourceforge.net
 S:      Maintained
@@ -6624,6 +6806,18 @@ S:	Supported
 F:      arch/arm/mach-davinci
 F:      drivers/i2c/busses/i2c-davinci.c
 
+TI DAVINCI SERIES MEDIA DRIVER
+M:      Manjunath Hadli <manjunath.hadli@ti.com>
+M:      Prabhakar Lad <prabhakar.lad@ti.com>
+L:      linux-media@vger.kernel.org
+L:      davinci-linux-open-source@linux.davincidsp.com (moderated for non-subscribers)
+W:      http://linuxtv.org/
+Q:      http://patchwork.linuxtv.org/project/linux-media/list/
+T:      git git://linuxtv.org/mhadli/v4l-dvb-davinci_devices.git
+S:      Supported
+F:      drivers/media/platform/davinci/
+F:      include/media/davinci/
+
 SIS 190 ETHERNET DRIVER
 M:      Francois Romieu <romieu@fr.zoreil.com>
 L:      netdev@vger.kernel.org
@@ -6690,6 +6884,15 @@ M:	Nicolas Pitre <nico@fluxnic.net>
 S:      Odd Fixes
 F:      drivers/net/ethernet/smsc/smc91x.*
 
+SMIA AND SMIA++ IMAGE SENSOR DRIVER
+M:      Sakari Ailus <sakari.ailus@iki.fi>
+L:      linux-media@vger.kernel.org
+S:      Maintained
+F:      drivers/media/i2c/smiapp
+F:      include/media/smiapp.h
+F:      drivers/media/i2c/smiapp-pll.c
+F:      drivers/media/i2c/smiapp-pll.h
+
 SMM665 HARDWARE MONITOR DRIVER
 M:      Guenter Roeck <linux@roeck-us.net>
 L:      lm-sensors@lm-sensors.org
@@ -6748,7 +6951,7 @@ F:	arch/ia64/sn/
 SOC-CAMERA V4L2 SUBSYSTEM
 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
+T:      git git://linuxtv.org/media_tree.git
 S:      Maintained
 F:      include/media/soc*
 F:      drivers/media/i2c/soc_camera/
@@ -7238,6 +7441,22 @@ T:	git git://linuxtv.org/mkrufky/tuners.git
 S:      Maintained
 F:      drivers/media/tuners/tda8290.*
 
+TEA5761 TUNER DRIVER
+M:      Mauro Carvalho Chehab <mchehab@redhat.com>
+L:      linux-media@vger.kernel.org
+W:      http://linuxtv.org
+T:      git git://linuxtv.org/media_tree.git
+S:      Odd fixes
+F:      drivers/media/tuners/tea5761.*
+
+TEA5767 TUNER DRIVER
+M:      Mauro Carvalho Chehab <mchehab@redhat.com>
+L:      linux-media@vger.kernel.org
+W:      http://linuxtv.org
+T:      git git://linuxtv.org/media_tree.git
+S:      Maintained
+F:      drivers/media/tuners/tea5767.*
+
 TEAM DRIVER
 M:      Jiri Pirko <jpirko@redhat.com>
 L:      netdev@vger.kernel.org
@@ -7245,6 +7464,12 @@ S:	Supported
 F:      drivers/net/team/
 F:      include/linux/if_team.h
 
+TECHNOTREND USB IR RECEIVER
+M:      Sean Young <sean@mess.org>
+L:      linux-media@vger.kernel.org
+S:      Maintained
+F:      drivers/media/rc/ttusbir.c
+
 TEGRA SUPPORT
 M:      Stephen Warren <swarren@wwwdotorg.org>
 L:      linux-tegra@vger.kernel.org
@@ -7397,6 +7622,14 @@ S:	Maintained
 F:      include/linux/shmem_fs.h
 F:      mm/shmem.c
 
+TM6000 VIDEO4LINUX DRIVER
+M:      Mauro Carvalho Chehab <mchehab@redhat.com>
+L:      linux-media@vger.kernel.org
+W:      http://linuxtv.org
+T:      git git://linuxtv.org/media_tree.git
+S:      Odd fixes
+F:      drivers/media/usb/tm6000/
+
 TPM DEVICE DRIVER
 M:      Kent Yoder <key@linux.vnet.ibm.com>
 M:      Rajiv Andrade <mail@srajiv.net>
@@ -7430,6 +7663,7 @@ K:	^Subject:.*(?i)trivial
 
 TTY LAYER
 M:      Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+M:      Jiri Slaby <jslaby@suse.cz>
 S:      Supported
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git
 F:      drivers/tty/
@@ -7455,8 +7689,7 @@ S:	Maintained
 F:      drivers/net/ethernet/dec/tulip/
 
 TUN/TAP driver
-M:      Maxim Krasnyansky <maxk@qualcomm.com>
-L:      vtun@office.satix.net
+M:      Maxim Krasnyansky <maxk@qti.qualcomm.com>
 W:      http://vtun.sourceforge.net/tun
 S:      Maintained
 F:      Documentation/networking/tuntap.txt
@@ -7578,6 +7811,12 @@ S:	Maintained
 F:      Documentation/usb/acm.txt
 F:      drivers/usb/class/cdc-acm.*
 
+USB AR5523 WIRELESS DRIVER
+M:      Pontus Fuchs <pontus.fuchs@gmail.com>
+L:      linux-wireless@vger.kernel.org
+S:      Maintained
+F:      drivers/net/wireless/ath/ar5523/
+
 USB ATTACHED SCSI
 M:      Matthew Wilcox <willy@linux.intel.com>
 M:      Sarah Sharp <sarah.a.sharp@linux.intel.com>
@@ -7586,12 +7825,6 @@ L:	linux-scsi@vger.kernel.org
 S:      Supported
 F:      drivers/usb/storage/uas.c
 
-USB BLOCK DRIVER (UB ub)
-M:      Pete Zaitcev <zaitcev@redhat.com>
-L:      linux-usb@vger.kernel.org
-S:      Supported
-F:      drivers/block/ub.c
-
 USB CDC ETHERNET DRIVER
 M:      Oliver Neukum <oliver@neukum.org>
 L:      linux-usb@vger.kernel.org
@@ -7791,7 +8024,7 @@ USB SN9C1xx 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
+T:      git git://linuxtv.org/media_tree.git
 W:      http://www.linux-projects.org
 S:      Maintained
 F:      Documentation/video4linux/sn9c102.txt
@@ -7827,10 +8060,11 @@ USB VIDEO CLASS
 M:      Laurent Pinchart <laurent.pinchart@ideasonboard.com>
 L:      linux-uvc-devel@lists.sourceforge.net (subscribers-only)
 L:      linux-media@vger.kernel.org
-T:      git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git
+T:      git git://linuxtv.org/media_tree.git
 W:      http://www.ideasonboard.org/uvc/
 S:      Maintained
 F:      drivers/media/usb/uvc/
+F:      include/uapi/linux/uvcvideo.h
 
 USB WEBCAM GADGET
 M:      Laurent Pinchart <laurent.pinchart@ideasonboard.com>
@@ -7862,7 +8096,7 @@ USB ZR364XX DRIVER
 M:      Antoine Jacquet <royale@zerezo.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
+T:      git git://linuxtv.org/media_tree.git
 W:      http://royale.zerezo.com/zr364xx/
 S:      Maintained
 F:      Documentation/video4linux/zr364xx.txt
@@ -8217,6 +8451,14 @@ L:	linux-edac@vger.kernel.org
 S:      Maintained
 F:      arch/x86/kernel/cpu/mcheck/*
 
+XC2028/3028 TUNER DRIVER
+M:      Mauro Carvalho Chehab <mchehab@redhat.com>
+L:      linux-media@vger.kernel.org
+W:      http://linuxtv.org
+T:      git git://linuxtv.org/media_tree.git
+S:      Maintained
+F:      drivers/media/tuners/tuner-xc2028.*
+
 XEN HYPERVISOR INTERFACE
 M:      Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
 M:      Jeremy Fitzhardinge <jeremy@goop.org>