projects / cascardo / linux.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
watchdog: Orion: Fix possible null-deference in orion_wdt_probe
[cascardo/linux.git] / MAINTAINERS
diff --git a/MAINTAINERS b/MAINTAINERS
index 0bc485c..4e2a1f6 100644 (file)
--- 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
@@ -1273,7 +1280,7 @@ F:        Documentation/hwmon/asc7621
 F:     drivers/hwmon/asc7621.c
 
 ASUS NOTEBOOKS AND EEEPC ACPI/WMI EXTRAS DRIVERS
-M:     Corentin Chary <corentincj@iksaif.net>
+M:     Corentin Chary <corentin.chary@gmail.com>
 L:     acpi4asus-user@lists.sourceforge.net
 L:     platform-driver-x86@vger.kernel.org
 W:     http://acpi4asus.sf.net
@@ -1494,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
@@ -1745,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*
 
@@ -1778,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/
@@ -1914,7 +1929,7 @@ F:        scripts/checkpatch.pl
 
 CHINESE DOCUMENTATION
 M:     Harry Wei <harryxiyou@gmail.com>
-L:     xiyoulinuxkernelgroup@googlegroups.com
+L:     xiyoulinuxkernelgroup@googlegroups.com (subscribers-only)
 L:     linux-kernel@zh-kernel.org (moderated for non-subscribers)
 S:     Maintained
 F:     Documentation/zh_CN/
@@ -2164,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>
@@ -2524,6 +2549,15 @@ S:       Supported
 F:     drivers/gpu/drm/exynos
 F:     include/drm/exynos*
 
+DRM DRIVERS FOR NVIDIA TEGRA
+M:     Thierry Reding <thierry.reding@avionic-design.de>
+L:     dri-devel@lists.freedesktop.org
+L:     linux-tegra@vger.kernel.org
+T:     git git://gitorious.org/thierryreding/linux.git
+S:     Maintained
+F:     drivers/gpu/drm/tegra/
+F:     Documentation/devicetree/bindings/gpu/nvidia,tegra20-host1x.txt
+
 DSCC4 DRIVER
 M:     Francois Romieu <romieu@fr.zoreil.com>
 L:     netdev@vger.kernel.org
@@ -2726,6 +2760,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>
@@ -2856,6 +2899,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>
@@ -2931,7 +2982,6 @@ L:        linux-ext4@vger.kernel.org
 S:     Maintained
 F:     Documentation/filesystems/ext3.txt
 F:     fs/ext3/
-F:     include/linux/ext3*
 
 EXT4 FILE SYSTEM
 M:     "Theodore Ts'o" <tytso@mit.edu>
@@ -3054,6 +3104,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
@@ -3070,7 +3128,8 @@ W:        http://ieee1394.wiki.kernel.org/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.git
 S:     Maintained
 F:     drivers/firewire/
-F:     include/linux/firewire*.h
+F:     include/linux/firewire.h
+F:     include/uapi/linux/firewire*.h
 F:     tools/firewire/
 
 FIRMWARE LOADER (request_firmware)
@@ -3112,6 +3171,12 @@ F:       drivers/video/
 F:     include/video/
 F:     include/linux/fb.h
 
+FREESCALE DIU FRAMEBUFFER DRIVER
+M:     Timur Tabi <timur@freescale.com>
+L:     linux-fbdev@vger.kernel.org
+S:     Supported
+F:     drivers/video/fsl-diu-fb.*
+
 FREESCALE DMA DRIVER
 M:     Li Yang <leoli@freescale.com>
 M:     Zhang Wei <zw@zh-kernel.org>
@@ -3340,56 +3405,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/
 
@@ -3596,7 +3661,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/
 
@@ -3656,7 +3721,7 @@ I2C/SMBUS STUB DRIVER
 M:     "Mark M. Hoffman" <mhoffman@lightlink.com>
 L:     linux-i2c@vger.kernel.org
 S:     Maintained
-F:     drivers/i2c/busses/i2c-stub.c
+F:     drivers/i2c/i2c-stub.c
 
 I2C SUBSYSTEM
 M:     Wolfram Sang <w.sang@pengutronix.de>
@@ -3787,6 +3852,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
@@ -4172,17 +4243,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
@@ -4219,7 +4314,6 @@ M:        Jan Kara <jack@suse.cz>
 L:     linux-ext4@vger.kernel.org
 S:     Maintained
 F:     fs/jbd/
-F:     include/linux/ext3_jbd.h
 F:     include/linux/jbd.h
 
 JOURNALLING LAYER FOR BLOCK DEVICES (JBD2)
@@ -4314,10 +4408,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
 
@@ -4325,6 +4419,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/
@@ -4627,6 +4722,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>
@@ -4654,13 +4757,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>
@@ -4717,6 +4823,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
@@ -4771,6 +4885,12 @@ S:       Maintained
 F:     drivers/net/ethernet/marvell/mv643xx_eth.*
 F:     include/linux/mv643xx.h
 
+MARVELL MVNETA ETHERNET DRIVER
+M:     Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+L:     netdev@vger.kernel.org
+S:     Maintained
+F:     drivers/net/ethernet/marvell/mvneta.*
+
 MARVELL MWIFIEX WIRELESS DRIVER
 M:     Bing Zhao <bzhao@marvell.com>
 L:     linux-wireless@vger.kernel.org
@@ -4809,12 +4929,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/
@@ -4822,8 +4942,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>
@@ -4905,7 +5030,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>
@@ -4919,6 +5044,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
@@ -5381,7 +5513,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
 
@@ -5930,11 +6062,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
@@ -6077,6 +6216,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
@@ -6317,10 +6471,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/
@@ -6328,7 +6491,7 @@ F:        drivers/media/pci/saa7146/
 F:     include/media/saa7146*
 
 SAMSUNG LAPTOP DRIVER
-M:     Corentin Chary <corentincj@iksaif.net>
+M:     Corentin Chary <corentin.chary@gmail.com>
 L:     platform-driver-x86@vger.kernel.org
 S:     Maintained
 F:     drivers/platform/x86/samsung-laptop.c
@@ -6355,6 +6518,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
@@ -6649,6 +6820,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
@@ -6715,6 +6898,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
@@ -6773,7 +6965,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/
@@ -7263,6 +7455,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
@@ -7270,6 +7478,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
@@ -7331,6 +7545,13 @@ S:       Maintained
 F:     sound/soc/codecs/lm49453*
 F:     sound/soc/codecs/isabelle*
 
+TI LP855x BACKLIGHT DRIVER
+M:     Milo Kim <milo.kim@ti.com>
+S:     Maintained
+F:     Documentation/backlight/lp855x-driver.txt
+F:     drivers/video/backlight/lp855x_bl.c
+F:     include/linux/platform_data/lp855x.h
+
 TI TWL4030 SERIES SOC CODEC DRIVER
 M:     Peter Ujfalusi <peter.ujfalusi@ti.com>
 L:     alsa-devel@alsa-project.org (moderated for non-subscribers)
@@ -7422,6 +7643,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>
@@ -7816,7 +8045,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
@@ -7852,10 +8081,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>
@@ -7887,7 +8117,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
@@ -8242,6 +8472,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>
Unnamed repository; edit this file 'description' to name the repository.