Merge tag 'ftracetest-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt...
[sfrench/cifs-2.6.git] / MAINTAINERS
index 27bd1cc05a6b5cd46bf8c1bf91d8f6dcb98d7207..e599d4184e15be939f3aa360521fe8afc553916d 100644 (file)
@@ -152,8 +152,9 @@ F:  drivers/scsi/53c700*
 
 6LOWPAN GENERIC (BTLE/IEEE 802.15.4)
 M:     Alexander Aring <alex.aring@gmail.com>
-L:     linux-zigbee-devel@lists.sourceforge.net (moderated for non-subscribers)
+M:     Jukka Rissanen <jukka.rissanen@linux.intel.com>
 L:     linux-bluetooth@vger.kernel.org
+L:     linux-wpan@vger.kernel.org
 S:     Maintained
 F:     net/6lowpan/
 F:     include/net/6lowpan.h
@@ -733,7 +734,6 @@ F:  net/appletalk/
 APPLIED MICRO (APM) X-GENE SOC ETHERNET DRIVER
 M:     Iyappan Subramanian <isubramanian@apm.com>
 M:     Keyur Chudgar <kchudgar@apm.com>
-M:     Ravi Patel <rapatel@apm.com>
 S:     Supported
 F:     drivers/net/ethernet/apm/xgene/
 F:     Documentation/devicetree/bindings/net/apm-xgene-enet.txt
@@ -846,6 +846,12 @@ M: Emilio López <emilio@elopez.com.ar>
 S:     Maintained
 F:     drivers/clk/sunxi/
 
+ARM/Amlogic MesonX SoC support
+M:     Carlo Caione <carlo@caione.org>
+L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+S:     Maintained
+N:     meson[x68]
+
 ARM/ATMEL AT91RM9200 AND AT91SAM ARM ARCHITECTURES
 M:     Andrew Victor <linux@maxim.org.za>
 M:     Nicolas Ferre <nicolas.ferre@atmel.com>
@@ -872,10 +878,9 @@ S: Maintained
 F:     arch/arm/mach-highbank/
 
 ARM/CAVIUM NETWORKS CNS3XXX MACHINE SUPPORT
-M:     Anton Vorontsov <anton@enomsg.org>
+M:     Krzysztof Halasa <khalasa@piap.pl>
 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>
@@ -975,7 +980,7 @@ F:  arch/arm/include/asm/hardware/dec21285.h
 F:     arch/arm/mach-footbridge/
 
 ARM/FREESCALE IMX / MXC ARM ARCHITECTURE
-M:     Shawn Guo <shawn.guo@freescale.com>
+M:     Shawn Guo <shawn.guo@linaro.org>
 M:     Sascha Hauer <kernel@pengutronix.de>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
@@ -1060,7 +1065,7 @@ S:        Maintained
 
 ARM/INTEL IXP4XX ARM ARCHITECTURE
 M:     Imre Kaloz <kaloz@openwrt.org>
-M:     Krzysztof Halasa <khc@pm.waw.pl>
+M:     Krzysztof Halasa <khalasa@piap.pl>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
 F:     arch/arm/mach-ixp4xx/
@@ -1156,6 +1161,16 @@ W:       http://www.digriz.org.uk/ts78xx/kernel
 S:     Maintained
 F:     arch/arm/mach-orion5x/ts78xx-*
 
+ARM/Mediatek SoC support
+M:     Matthias Brugger <matthias.bgg@gmail.com>
+L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+S:     Maintained
+F:     arch/arm/boot/dts/mt6*
+F:     arch/arm/boot/dts/mt8*
+F:     arch/arm/mach-mediatek/
+N:     mtk
+K:     mediatek
+
 ARM/MICREL KS8695 ARCHITECTURE
 M:     Greg Ungerer <gerg@uclinux.org>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@ -1367,7 +1382,6 @@ F:        arch/arm/boot/dts/sh*
 F:     arch/arm/configs/ape6evm_defconfig
 F:     arch/arm/configs/armadillo800eva_defconfig
 F:     arch/arm/configs/bockw_defconfig
-F:     arch/arm/configs/genmai_defconfig
 F:     arch/arm/configs/koelsch_defconfig
 F:     arch/arm/configs/kzm9g_defconfig
 F:     arch/arm/configs/lager_defconfig
@@ -1378,15 +1392,23 @@ F:      arch/arm/mach-shmobile/
 F:     drivers/sh/
 
 ARM/SOCFPGA ARCHITECTURE
-M:     Dinh Nguyen <dinguyen@altera.com>
+M:     Dinh Nguyen <dinguyen@opensource.altera.com>
 S:     Maintained
 F:     arch/arm/mach-socfpga/
+W:     http://www.rocketboards.org
+T:     git://git.rocketboards.org/linux-socfpga.git
+T:     git://git.rocketboards.org/linux-socfpga-next.git
 
 ARM/SOCFPGA CLOCK FRAMEWORK SUPPORT
-M:     Dinh Nguyen <dinguyen@altera.com>
+M:     Dinh Nguyen <dinguyen@opensource.altera.com>
 S:     Maintained
 F:     drivers/clk/socfpga/
 
+ARM/SOCFPGA EDAC SUPPORT
+M:     Thor Thayer <tthayer@opensource.altera.com>
+S:     Maintained
+F:     drivers/edac/altera_edac.
+
 ARM/STI ARCHITECTURE
 M:     Srinivas Kandagatla <srinivas.kandagatla@gmail.com>
 M:     Maxime Coquelin <maxime.coquelin@st.com>
@@ -1627,6 +1649,7 @@ L:        wil6210@qca.qualcomm.com
 S:     Supported
 W:     http://wireless.kernel.org/en/users/Drivers/wil6210
 F:     drivers/net/wireless/ath/wil6210/
+F:     include/uapi/linux/wil6210_uapi.h
 
 CARL9170 LINUX COMMUNITY WIRELESS DRIVER
 M:     Christian Lamparter <chunkeey@googlemail.com>
@@ -2021,6 +2044,7 @@ F:        drivers/net/ethernet/broadcom/bnx2x/
 BROADCOM BCM281XX/BCM11XXX/BCM216XX ARM ARCHITECTURE
 M:     Christian Daudt <bcm@fixthebug.org>
 M:     Matt Porter <mporter@linaro.org>
+M:     Florian Fainelli <f.fainelli@gmail.com>
 L:     bcm-kernel-feedback-list@broadcom.com
 T:     git git://github.com/broadcom/mach-bcm
 S:     Maintained
@@ -2050,6 +2074,14 @@ F:       arch/arm/mach-bcm/bcm_5301x.c
 F:     arch/arm/boot/dts/bcm5301x.dtsi
 F:     arch/arm/boot/dts/bcm470*
 
+BROADCOM BCM63XX ARM ARCHITECTURE
+M:     Florian Fainelli <f.fainelli@gmail.com>
+L:     linux-arm-kernel@lists.infradead.org
+T:     git git://git.github.com/brcm/linux.git
+S:     Maintained
+F:     arch/arm/mach-bcm/bcm63xx.c
+F:     arch/arm/include/debug/bcm63xx.S
+
 BROADCOM BCM7XXX ARM ARCHITECTURE
 M:     Marc Carino <marc.ceeeee@gmail.com>
 M:     Brian Norris <computersforpeace@gmail.com>
@@ -2728,6 +2760,18 @@ W:       http://www.chelsio.com
 S:     Supported
 F:     drivers/net/ethernet/chelsio/cxgb4vf/
 
+CXL (IBM Coherent Accelerator Processor Interface CAPI) DRIVER
+M:     Ian Munsie <imunsie@au1.ibm.com>
+M:     Michael Neuling <mikey@neuling.org>
+L:     linuxppc-dev@lists.ozlabs.org
+S:     Supported
+F:     drivers/misc/cxl/
+F:     include/misc/cxl.h
+F:     include/uapi/misc/cxl.h
+F:     Documentation/powerpc/cxl.txt
+F:     Documentation/powerpc/cxl.txt
+F:     Documentation/ABI/testing/sysfs-class-cxl
+
 STMMAC ETHERNET DRIVER
 M:     Giuseppe Cavallaro <peppe.cavallaro@st.com>
 L:     netdev@vger.kernel.org
@@ -3574,6 +3618,11 @@ T:       git git://git.kernel.org/pub/scm/linux/kernel/git/kristoffer/linux-hpc.git
 F:     drivers/video/fbdev/s1d13xxxfb.c
 F:     include/video/s1d13xxxfb.h
 
+ET131X NETWORK DRIVER
+M:     Mark Einon <mark.einon@gmail.com>
+S:     Odd Fixes
+F:     drivers/net/ethernet/agere/
+
 ETHERNET BRIDGE
 M:     Stephen Hemminger <stephen@networkplumber.org>
 L:     bridge@lists.linux-foundation.org
@@ -4195,6 +4244,16 @@ L:       linuxppc-dev@lists.ozlabs.org
 S:     Odd Fixes
 F:     drivers/tty/hvc/
 
+HACKRF 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/hackrf/
+
 HARDWARE MONITORING
 M:     Jean Delvare <jdelvare@suse.de>
 M:     Guenter Roeck <linux@roeck-us.net>
@@ -4619,13 +4678,14 @@ F:      drivers/idle/i7300_idle.c
 
 IEEE 802.15.4 SUBSYSTEM
 M:     Alexander Aring <alex.aring@gmail.com>
-L:     linux-zigbee-devel@lists.sourceforge.net (moderated for non-subscribers)
-W:     http://apps.sourceforge.net/trac/linux-zigbee
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/lowpan/lowpan.git
+L:     linux-wpan@vger.kernel.org
+W:     https://github.com/linux-wpan
+T:     git git://github.com/linux-wpan/linux-wpan-next.git
 S:     Maintained
 F:     net/ieee802154/
 F:     net/mac802154/
 F:     drivers/net/ieee802154/
+F:     Documentation/networking/ieee802154.txt
 
 IGUANAWORKS USB IR TRANSCEIVER
 M:     Sean Young <sean@mess.org>
@@ -4796,7 +4856,7 @@ S:        Odd fixes
 F:     drivers/dma/iop-adma.c
 
 INTEL IXP4XX QMGR, NPE, ETHERNET and HSS SUPPORT
-M:     Krzysztof Halasa <khc@pm.waw.pl>
+M:     Krzysztof Halasa <khalasa@piap.pl>
 S:     Maintained
 F:     arch/arm/mach-ixp4xx/include/mach/qmgr.h
 F:     arch/arm/mach-ixp4xx/include/mach/npe.h
@@ -4810,14 +4870,14 @@ M:      Deepak Saxena <dsaxena@plexity.net>
 S:     Maintained
 F:     drivers/char/hw_random/ixp4xx-rng.c
 
-INTEL ETHERNET DRIVERS (e100/e1000/e1000e/igb/igbvf/ixgb/ixgbe/ixgbevf/i40e/i40evf)
+INTEL ETHERNET DRIVERS (e100/e1000/e1000e/fm10k/igb/igbvf/ixgb/ixgbe/ixgbevf/i40e/i40evf)
 M:     Jeff Kirsher <jeffrey.t.kirsher@intel.com>
 M:     Jesse Brandeburg <jesse.brandeburg@intel.com>
 M:     Bruce Allan <bruce.w.allan@intel.com>
 M:     Carolyn Wyborny <carolyn.wyborny@intel.com>
 M:     Don Skidmore <donald.c.skidmore@intel.com>
 M:     Greg Rose <gregory.v.rose@intel.com>
-M:     Alex Duyck <alexander.h.duyck@intel.com>
+M:     Matthew Vick <matthew.vick@intel.com>
 M:     John Ronciak <john.ronciak@intel.com>
 M:     Mitch Williams <mitch.a.williams@intel.com>
 M:     Linux NICS <linux.nics@intel.com>
@@ -5006,6 +5066,7 @@ L:        linux-kernel@vger.kernel.org
 S:     Maintained
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git irq/core
 T:     git git://git.infradead.org/users/jcooper/linux.git irqchip/core
+F:     Documentation/devicetree/bindings/interrupt-controller/
 F:     drivers/irqchip/
 
 IRQ DOMAINS (IRQ NUMBER MAPPING LIBRARY)
@@ -5091,7 +5152,7 @@ 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/tuner_it913x*
+F:     drivers/media/tuners/it913x*
 
 IVTV VIDEO4LINUX DRIVER
 M:     Andy Walls <awalls@md.metrocast.net>
@@ -6398,7 +6459,7 @@ M:        Lauro Ramos Venancio <lauro.venancio@openbossa.org>
 M:     Aloisio Almeida Jr <aloisio.almeida@openbossa.org>
 M:     Samuel Ortiz <sameo@linux.intel.com>
 L:     linux-wireless@vger.kernel.org
-L:     linux-nfc@lists.01.org (moderated for non-subscribers)
+L:     linux-nfc@lists.01.org (subscribers-only)
 S:     Supported
 F:     net/nfc/
 F:     include/net/nfc/
@@ -6566,10 +6627,9 @@ S:       Maintained
 F:     drivers/mmc/host/omap.c
 
 OMAP HS MMC SUPPORT
-M:     Balaji T K <balajitk@ti.com>
 L:     linux-mmc@vger.kernel.org
 L:     linux-omap@vger.kernel.org
-S:     Maintained
+S:     Orphan
 F:     drivers/mmc/host/omap_hsmmc.c
 
 OMAP RANDOM NUMBER GENERATOR SUPPORT
@@ -6899,6 +6959,14 @@ F:       include/linux/pci*
 F:     arch/x86/pci/
 F:     arch/x86/kernel/quirks.c
 
+PCI DRIVER FOR APPLIEDMICRO XGENE
+M:     Tanmay Inamdar <tinamdar@apm.com>
+L:     linux-pci@vger.kernel.org
+L:     linux-arm-kernel@lists.infradead.org
+S:     Maintained
+F:     Documentation/devicetree/bindings/pci/xgene-pci.txt
+F:     drivers/pci/host/pci-xgene.c
+
 PCI DRIVER FOR IMX6
 M:     Richard Zhu <r65037@freescale.com>
 M:     Lucas Stach <l.stach@pengutronix.de>
@@ -6907,6 +6975,13 @@ L:       linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
 F:     drivers/pci/host/*imx6*
 
+PCI DRIVER FOR TI KEYSTONE
+M:     Murali Karicheri <m-karicheri2@ti.com>
+L:     linux-pci@vger.kernel.org
+L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+S:     Maintained
+F:     drivers/pci/host/*keystone*
+
 PCI DRIVER FOR MVEBU (Marvell Armada 370 and Armada XP SOC support)
 M:     Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 M:     Jason Cooper <jason@lakedaemon.net>
@@ -7309,6 +7384,14 @@ T:       git git://linuxtv.org/media_tree.git
 S:     Maintained
 F:     drivers/media/usb/pwc/*
 
+PWM FAN DRIVER
+M:     Kamil Debski <k.debski@samsung.com>
+L:     lm-sensors@lm-sensors.org
+S:     Supported
+F:     Documentation/devicetree/bindings/hwmon/pwm-fan.txt
+F:     Documentation/hwmon/pwm-fan
+F:     drivers/hwmon/pwm-fan.c
+
 PWM SUBSYSTEM
 M:     Thierry Reding <thierry.reding@gmail.com>
 L:     linux-pwm@vger.kernel.org
@@ -7322,12 +7405,12 @@ F:      drivers/video/backlight/pwm_bl.c
 F:     include/linux/pwm_backlight.h
 
 PXA2xx/PXA3xx SUPPORT
-M:     Eric Miao <eric.y.miao@gmail.com>
-M:     Russell King <linux@arm.linux.org.uk>
+M:     Daniel Mack <daniel@zonque.org>
 M:     Haojian Zhuang <haojian.zhuang@gmail.com>
+M:     Robert Jarzmik <robert.jarzmik@free.fr>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 T:     git git://github.com/hzhuang1/linux.git
-T:     git git://git.linaro.org/people/ycmiao/pxa-linux.git
+T:     git git://github.com/rjarzmik/linux.git
 S:     Maintained
 F:     arch/arm/mach-pxa/
 F:     drivers/pcmcia/pxa2xx*
@@ -7404,15 +7487,15 @@ F:      drivers/net/ethernet/qlogic/qla3xxx.*
 
 QLOGIC QLCNIC (1/10)Gb ETHERNET DRIVER
 M:     Shahed Shaikh <shahed.shaikh@qlogic.com>
-M:     Dept-HSGLinuxNICDev@qlogic.com
+M:     Dept-GELinuxNICDev@qlogic.com
 L:     netdev@vger.kernel.org
 S:     Supported
 F:     drivers/net/ethernet/qlogic/qlcnic/
 
 QLOGIC QLGE 10Gb ETHERNET DRIVER
-M:     Shahed Shaikh <shahed.shaikh@qlogic.com>
-M:     Jitendra Kalsaria <jitendra.kalsaria@qlogic.com>
-M:     Ron Mercer <ron.mercer@qlogic.com>
+M:     Harish Patil <harish.patil@qlogic.com>
+M:     Sudarsana Kalluru <sudarsana.kalluru@qlogic.com>
+M:     Dept-GELinuxNICDev@qlogic.com
 M:     linux-driver@qlogic.com
 L:     netdev@vger.kernel.org
 S:     Supported
@@ -7515,13 +7598,12 @@ F:      drivers/video/fbdev/aty/aty128fb.c
 
 RALINK RT2X00 WIRELESS LAN DRIVER
 P:     rt2x00 project
-M:     Ivo van Doorn <IvDoorn@gmail.com>
+M:     Stanislaw Gruszka <sgruszka@redhat.com>
 M:     Helmut Schaa <helmut.schaa@googlemail.com>
 L:     linux-wireless@vger.kernel.org
 L:     users@rt2x00.serialmonkey.com (moderated for non-subscribers)
 W:     http://rt2x00.serialmonkey.com/
 S:     Maintained
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/ivd/rt2x00.git
 F:     drivers/net/wireless/rt2x00/
 
 RAMDISK RAM BLOCK DEVICE DRIVER
@@ -8436,11 +8518,11 @@ S:      Maintained
 F:     Documentation/security/Smack.txt
 F:     security/smack/
 
-SMARTREFLEX DRIVERS FOR ADAPTIVE VOLTAGE SCALING (AVS)
+DRIVERS FOR ADAPTIVE VOLTAGE SCALING (AVS)
 M:     Kevin Hilman <khilman@kernel.org>
 M:     Nishanth Menon <nm@ti.com>
 S:     Maintained
-F:     drivers/power/avs/smartreflex.c
+F:     drivers/power/avs/
 F:     include/linux/power/smartreflex.h
 L:     linux-pm@vger.kernel.org
 
@@ -8610,6 +8692,14 @@ F:       include/sound/dmaengine_pcm.h
 F:     sound/core/pcm_dmaengine.c
 F:     sound/soc/soc-generic-dmaengine-pcm.c
 
+SP2 MEDIA DRIVER
+M:     Olli Salonen <olli.salonen@iki.fi>
+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/sp2*
+
 SPARC + UltraSPARC (sparc/sparc64)
 M:     "David S. Miller" <davem@davemloft.net>
 L:     sparclinux@vger.kernel.org
@@ -8721,11 +8811,6 @@ M:       H Hartley Sweeten <hsweeten@visionengravers.com>
 S:     Odd Fixes
 F:     drivers/staging/comedi/
 
-STAGING - ET131X NETWORK DRIVER
-M:     Mark Einon <mark.einon@gmail.com>
-S:     Odd Fixes
-F:     drivers/staging/et131x/
-
 STAGING - FLARION FT1000 DRIVERS
 M:     Marek Belisko <marek.belisko@gmail.com>
 S:     Odd Fixes
@@ -9044,17 +9129,13 @@ F:      drivers/media/rc/ttusbir.c
 TEGRA ARCHITECTURE SUPPORT
 M:     Stephen Warren <swarren@wwwdotorg.org>
 M:     Thierry Reding <thierry.reding@gmail.com>
+M:     Alexandre Courbot <gnurou@gmail.com>
 L:     linux-tegra@vger.kernel.org
 Q:     http://patchwork.ozlabs.org/project/linux-tegra/list/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git
 S:     Supported
 N:     [^a-z]tegra
 
-TEGRA ASOC DRIVER
-M:     Stephen Warren <swarren@wwwdotorg.org>
-S:     Supported
-F:     sound/soc/tegra/
-
 TEGRA CLOCK DRIVER
 M:     Peter De Schrijver <pdeschrijver@nvidia.com>
 M:     Prashant Gaikwad <pgaikwad@nvidia.com>
@@ -9066,11 +9147,6 @@ M:       Laxman Dewangan <ldewangan@nvidia.com>
 S:     Supported
 F:     drivers/dma/tegra20-apb-dma.c
 
-TEGRA GPIO DRIVER
-M:     Stephen Warren <swarren@wwwdotorg.org>
-S:     Supported
-F:     drivers/gpio/gpio-tegra.c
-
 TEGRA I2C DRIVER
 M:     Laxman Dewangan <ldewangan@nvidia.com>
 S:     Supported
@@ -9087,11 +9163,6 @@ M:       Laxman Dewangan <ldewangan@nvidia.com>
 S:     Supported
 F:     drivers/input/keyboard/tegra-kbc.c
 
-TEGRA PINCTRL DRIVER
-M:     Stephen Warren <swarren@wwwdotorg.org>
-S:     Supported
-F:     drivers/pinctrl/pinctrl-tegra*
-
 TEGRA PWM DRIVER
 M:     Thierry Reding <thierry.reding@gmail.com>
 S:     Supported
@@ -9182,6 +9253,15 @@ F:       drivers/misc/tifm*
 F:     drivers/mmc/host/tifm_sd.c
 F:     include/linux/tifm.h
 
+TI KEYSTONE MULTICORE NAVIGATOR DRIVERS
+M:     Santosh Shilimkar <santosh.shilimkar@ti.com>
+L:     linux-kernel@vger.kernel.org
+L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+S:     Maintained
+F:     drivers/soc/ti/*
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git
+
+
 TI LM49xxx FAMILY ASoC CODEC DRIVERS
 M:     M R Swami Reddy <mr.swami.reddy@ti.com>
 M:     Vishwas A Deshpande <vishwas.a.deshpande@ti.com>
@@ -9323,6 +9403,14 @@ T:       git git://linuxtv.org/media_tree.git
 S:     Odd fixes
 F:     drivers/media/usb/tm6000/
 
+TW68 VIDEO4LINUX DRIVER
+M:     Hans Verkuil <hverkuil@xs4all.nl>
+L:     linux-media@vger.kernel.org
+T:     git git://linuxtv.org/media_tree.git
+W:     http://linuxtv.org
+S:     Odd Fixes
+F:     drivers/media/pci/tw68/
+
 TPM DEVICE DRIVER
 M:     Peter Huewe <peterhuewe@gmx.de>
 M:     Ashley Lai <ashley@ashleylai.com>
@@ -9344,6 +9432,7 @@ F:        include/*/ftrace.h
 F:     include/linux/trace*.h
 F:     include/trace/
 F:     kernel/trace/
+F:     tools/testing/selftests/ftrace/
 
 TRIVIAL PATCHES
 M:     Jiri Kosina <trivial@kernel.org>
@@ -10191,6 +10280,15 @@ S:     Supported
 F:     drivers/block/xen-blkback/*
 F:     drivers/block/xen*
 
+XEN PVSCSI DRIVERS
+M:     Juergen Gross <jgross@suse.com>
+L:     xen-devel@lists.xenproject.org (moderated for non-subscribers)
+L:     linux-scsi@vger.kernel.org
+S:     Supported
+F:     drivers/scsi/xen-scsifront.c
+F:     drivers/xen/xen-scsiback.c
+F:     include/xen/interface/io/vscsiif.h
+
 XEN SWIOTLB SUBSYSTEM
 M:     Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
 L:     xen-devel@lists.xenproject.org (moderated for non-subscribers)