]> git.kernelconcepts.de Git - karo-tx-linux.git/blobdiff - MAINTAINERS
fs/proc/root.c: use NULL instead of 0 for pointer
[karo-tx-linux.git] / MAINTAINERS
index 78336396a432e0a076a9cda21a60cc483c33497e..08b3a075708765b21855543918b07053a4716364 100644 (file)
@@ -572,7 +572,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
@@ -760,6 +760,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>
@@ -1062,7 +1063,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>
@@ -1072,7 +1073,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>
@@ -1080,7 +1081,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>
@@ -1352,7 +1353,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
@@ -1513,7 +1514,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
@@ -1650,7 +1651,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
@@ -1700,7 +1700,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 +1730,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>
@@ -2119,7 +2119,7 @@ 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/
 
 CXGB3 ETHERNET DRIVER (CXGB3)
 M:     Divy Le Ray <divy@chelsio.com>
@@ -2383,11 +2383,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
@@ -2783,8 +2778,8 @@ 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
 
 FANOTIFY
 M:     Eric Paris <eparis@redhat.com>
@@ -3014,7 +3009,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
@@ -3112,6 +3107,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>
@@ -3131,49 +3127,49 @@ 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/
 
 HARD DRIVE ACTIVE PROTECTION SYSTEM (HDAPS) DRIVER
 M:     Frank Seidel <frank@f-seidel.de>
@@ -3427,6 +3423,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
@@ -3438,6 +3446,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>
@@ -3874,7 +3889,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
@@ -4570,7 +4585,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
@@ -4652,6 +4667,14 @@ L:       alsa-devel@alsa-project.org
 W:     http://www.native-instruments.com
 F:     sound/usb/caiaq/
 
+NATIVE LINUX KVM TOOL
+M:     Pekka Enberg <penberg@kernel.org>
+M:     Sasha Levin <levinsasha928@gmail.com>
+M:     Asias He <asias.hejun@gmail.com>
+L:     kvm@vger.kernel.org
+S:     Maintained
+F:     tools/kvm/
+
 NCP FILESYSTEM
 M:     Petr Vandrovec <petr@vandrovec.name>
 S:     Odd Fixes
@@ -4947,8 +4970,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
@@ -4974,7 +4999,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>
@@ -5015,7 +5040,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>
@@ -5049,6 +5074,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
 
@@ -5360,7 +5386,7 @@ S:        Maintained
 F:     drivers/pinctrl/spear/
 
 PKTCDVD DRIVER
-M:     Peter Osterlund <petero2@telia.com>
+M:     Jiri Kosina <jkosina@suse.cz>
 S:     Maintained
 F:     drivers/block/pktcdvd.c
 F:     include/linux/pktcdvd.h
@@ -5517,13 +5543,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*
@@ -5546,7 +5584,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>
@@ -5916,9 +5954,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>
@@ -5955,7 +5993,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
@@ -5979,7 +6017,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>
@@ -6103,7 +6141,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
@@ -6367,8 +6405,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>
@@ -6411,6 +6450,11 @@ W:       http://tifmxx.berlios.de/
 S:     Maintained
 F:     drivers/memstick/host/tifm_ms.c
 
+SONY MEMORYSTICK STANDARD SUPPORT
+M:     Maxim Levitsky <maximlevitsky@gmail.com>
+S:     Maintained
+F:     drivers/memstick/core/ms_block.*
+
 SOUND
 M:     Jaroslav Kysela <perex@perex.cz>
 M:     Takashi Iwai <tiwai@suse.de>
@@ -6468,7 +6512,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)
@@ -6477,7 +6521,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)
@@ -6486,7 +6530,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)
@@ -6497,7 +6541,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
@@ -6505,7 +6549,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
@@ -7148,15 +7192,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
@@ -7326,7 +7361,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>
@@ -7361,17 +7396,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>
@@ -7400,7 +7425,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>
@@ -7458,7 +7483,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
@@ -7770,6 +7795,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)
@@ -7860,7 +7892,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>