]> rtime.felk.cvut.cz Git - can-eth-gw-linux.git/blobdiff - MAINTAINERS
projects / can-eth-gw-linux.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
ARM: imx6q: let users input debug uart port number
[can-eth-gw-linux.git] / MAINTAINERS
diff --git a/MAINTAINERS b/MAINTAINERS
index 45e8212bb4c8cb31123523cd082b4a6d107ff306..9f78c28a848b273d2a5eb3e80911509eb6ae969b 100644 (file)
--- 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
@@ -391,6 +401,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
@@ -759,7 +789,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
@@ -1063,7 +1092,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>
@@ -1073,7 +1102,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>
@@ -1081,7 +1110,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>
@@ -1246,7 +1275,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/
@@ -1353,7 +1382,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
@@ -1514,7 +1543,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
@@ -1700,7 +1729,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>
@@ -1730,7 +1759,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>
@@ -1928,10 +1957,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/
@@ -2119,7 +2148,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>
@@ -2383,11 +2422,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
@@ -2474,6 +2508,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
@@ -2485,6 +2630,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
@@ -2513,6 +2668,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>
@@ -2795,8 +2960,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>
@@ -3026,7 +3201,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
@@ -3144,49 +3319,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>
@@ -3240,6 +3422,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
@@ -3906,7 +4098,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
@@ -4200,6 +4392,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
@@ -4602,7 +4814,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
@@ -4666,6 +4878,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
@@ -4979,8 +5201,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
@@ -5006,7 +5230,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>
@@ -5047,7 +5271,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>
@@ -5550,6 +5774,18 @@ 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
@@ -5579,7 +5815,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>
@@ -5689,6 +5925,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
@@ -5855,6 +6101,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
@@ -5949,9 +6205,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>
@@ -6012,7 +6268,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>
@@ -6400,8 +6656,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>
@@ -6778,6 +7035,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
@@ -6819,6 +7084,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
@@ -6849,6 +7174,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/
 
@@ -7009,6 +7336,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
@@ -7126,6 +7463,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
@@ -7181,15 +7524,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
@@ -7359,7 +7693,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>
@@ -7394,17 +7728,7 @@ 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/
-
-USB W996[87]CF 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:     Documentation/video4linux/w9968cf.txt
-F:     drivers/media/video/w996*
+F:     drivers/media/usb/uvc/
 
 USB WIRELESS RNDIS DRIVER (rndis_wlan)
 M:     Jussi Kivilinna <jussi.kivilinna@mbnet.fi>
@@ -7433,7 +7757,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>
@@ -7491,7 +7815,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
@@ -7803,6 +8127,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)
@@ -7893,7 +8224,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>