]> git.kernelconcepts.de Git - karo-tx-linux.git/blobdiff - MAINTAINERS
KVM: x86: Fix DR7 mask on task-switch while debugging
[karo-tx-linux.git] / MAINTAINERS
index 76dfb2b7028fd0ad3b54569884707561b2cfd452..781e099495d35b5d4c245455b7bc07fc80fd831f 100644 (file)
@@ -569,6 +569,12 @@ L: nios2-dev@lists.rocketboards.org (moderated for non-subscribers)
 S:     Maintained
 F:     drivers/mailbox/mailbox-altera.c
 
+ALTERA PIO DRIVER
+M:     Tien Hock Loh <thloh@altera.com>
+L:     linux-gpio@vger.kernel.org
+S:     Maintained
+F:     drivers/gpio/gpio-altera.c
+
 ALTERA TRIPLE SPEED ETHERNET DRIVER
 M:     Vince Bridgers <vbridger@opensource.altera.com>
 L:     netdev@vger.kernel.org
@@ -625,16 +631,16 @@ F:        drivers/iommu/amd_iommu*.[ch]
 F:     include/linux/amd-iommu.h
 
 AMD KFD
-M:      Oded Gabbay <oded.gabbay@amd.com>
-L:      dri-devel@lists.freedesktop.org
-T:      git git://people.freedesktop.org/~gabbayo/linux.git
-S:      Supported
-F:      drivers/gpu/drm/amd/amdkfd/
+M:     Oded Gabbay <oded.gabbay@amd.com>
+L:     dri-devel@lists.freedesktop.org
+T:     git git://people.freedesktop.org/~gabbayo/linux.git
+S:     Supported
+F:     drivers/gpu/drm/amd/amdkfd/
 F:     drivers/gpu/drm/amd/include/cik_structs.h
 F:     drivers/gpu/drm/amd/include/kgd_kfd_interface.h
-F:      drivers/gpu/drm/radeon/radeon_kfd.c
-F:      drivers/gpu/drm/radeon/radeon_kfd.h
-F:      include/uapi/linux/kfd_ioctl.h
+F:     drivers/gpu/drm/radeon/radeon_kfd.c
+F:     drivers/gpu/drm/radeon/radeon_kfd.h
+F:     include/uapi/linux/kfd_ioctl.h
 
 AMD MICROCODE UPDATE SUPPORT
 M:     Borislav Petkov <bp@alien8.de>
@@ -724,7 +730,7 @@ F:  staging/iio/trigger/iio-trig-bfin-timer.c
 
 ANDROID DRIVERS
 M:     Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-M:     Arve Hjønnevåg <arve@android.com>
+M:     Arve Hjønnevåg <arve@android.com>
 M:     Riley Andrews <riandrews@android.com>
 T:     git git://git.kernel.org/pub/scm/linux/kernel/gregkh/staging.git
 L:     devel@driverdev.osuosl.org
@@ -880,6 +886,11 @@ S: Maintained
 F:     drivers/media/rc/meson-ir.c
 N:     meson[x68]
 
+ARM/Annapurna Labs ALPINE ARCHITECTURE
+M:     Tsahee Zidenberg <tsahee@annapurnalabs.com>
+S:     Maintained
+F:     arch/arm/mach-alpine/
+
 ARM/ATMEL AT91RM9200 AND AT91SAM ARM ARCHITECTURES
 M:     Andrew Victor <linux@maxim.org.za>
 M:     Nicolas Ferre <nicolas.ferre@atmel.com>
@@ -952,7 +963,7 @@ ARM/CORESIGHT FRAMEWORK AND DRIVERS
 M:     Mathieu Poirier <mathieu.poirier@linaro.org>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
-F:     drivers/coresight/*
+F:     drivers/hwtracing/coresight/*
 F:     Documentation/trace/coresight.txt
 F:     Documentation/devicetree/bindings/arm/coresight.txt
 F:     Documentation/ABI/testing/sysfs-bus-coresight-devices-*
@@ -1215,6 +1226,7 @@ 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)
+L:     linux-mediatek@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
 F:     arch/arm/boot/dts/mt6*
 F:     arch/arm/boot/dts/mt8*
@@ -1254,22 +1266,6 @@ L:       openmoko-kernel@lists.openmoko.org (subscribers-only)
 W:     http://wiki.openmoko.org/wiki/Neo_FreeRunner
 S:     Supported
 
-ARM/QUALCOMM MSM MACHINE SUPPORT
-M:     David Brown <davidb@codeaurora.org>
-M:     Daniel Walker <dwalker@fifo99.com>
-M:     Bryan Huntsman <bryanh@codeaurora.org>
-L:     linux-arm-msm@vger.kernel.org
-F:     arch/arm/mach-msm/
-F:     drivers/video/fbdev/msm/
-F:     drivers/mmc/host/msm_sdcc.c
-F:     drivers/mmc/host/msm_sdcc.h
-F:     drivers/tty/serial/msm_serial.h
-F:     drivers/tty/serial/msm_serial.c
-F:     drivers/*/pm8???-*
-F:     drivers/mfd/ssbi.c
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm.git
-S:     Maintained
-
 ARM/TOSA MACHINE SUPPORT
 M:     Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
 M:     Dirk Opfer <dirk@opfer-online.de>
@@ -1327,6 +1323,11 @@ L:       linux-soc@vger.kernel.org
 S:     Maintained
 F:     arch/arm/mach-qcom/
 F:     drivers/soc/qcom/
+F:     drivers/tty/serial/msm_serial.h
+F:     drivers/tty/serial/msm_serial.c
+F:     drivers/*/pm8???-*
+F:     drivers/mfd/ssbi.c
+F:     drivers/firmware/qcom_scm.c
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/galak/linux-qcom.git
 
 ARM/RADISYS ENP2611 MACHINE SUPPORT
@@ -1425,11 +1426,9 @@ F:       arch/arm/boot/dts/emev2*
 F:     arch/arm/boot/dts/r7s*
 F:     arch/arm/boot/dts/r8a*
 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/kzm9g_defconfig
-F:     arch/arm/configs/mackerel_defconfig
 F:     arch/arm/configs/marzen_defconfig
 F:     arch/arm/configs/shmobile_defconfig
 F:     arch/arm/include/debug/renesas-scif.S
@@ -1468,6 +1467,8 @@ F:        drivers/clocksource/arm_global_timer.c
 F:     drivers/i2c/busses/i2c-st.c
 F:     drivers/media/rc/st_rc.c
 F:     drivers/mmc/host/sdhci-st.c
+F:     drivers/phy/phy-miphy28lp.c
+F:     drivers/phy/phy-miphy365x.c
 F:     drivers/phy/phy-stih407-usb.c
 F:     drivers/phy/phy-stih41x-usb.c
 F:     drivers/pinctrl/pinctrl-st.c
@@ -1762,7 +1763,7 @@ S:        Supported
 F:     drivers/tty/serial/atmel_serial.c
 
 ATMEL Audio ALSA driver
-M:     Bo Shen <voice.shen@atmel.com>
+M:     Nicolas Ferre <nicolas.ferre@atmel.com>
 L:     alsa-devel@alsa-project.org (moderated for non-subscribers)
 S:     Supported
 F:     sound/soc/atmel
@@ -1819,7 +1820,7 @@ S:        Supported
 F:     drivers/spi/spi-atmel.*
 
 ATMEL SSC DRIVER
-M:     Bo Shen <voice.shen@atmel.com>
+M:     Nicolas Ferre <nicolas.ferre@atmel.com>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Supported
 F:     drivers/misc/atmel-ssc.c
@@ -1913,16 +1914,14 @@ S:      Maintained
 F:     drivers/media/radio/radio-aztech*
 
 B43 WIRELESS DRIVER
-M:     Stefano Brivio <stefano.brivio@polimi.it>
 L:     linux-wireless@vger.kernel.org
 L:     b43-dev@lists.infradead.org
 W:     http://wireless.kernel.org/en/users/Drivers/b43
-S:     Maintained
+S:     Odd Fixes
 F:     drivers/net/wireless/b43/
 
 B43LEGACY WIRELESS DRIVER
 M:     Larry Finger <Larry.Finger@lwfinger.net>
-M:     Stefano Brivio <stefano.brivio@polimi.it>
 L:     linux-wireless@vger.kernel.org
 L:     b43-dev@lists.infradead.org
 W:     http://wireless.kernel.org/en/users/Drivers/b43
@@ -1965,10 +1964,10 @@ F:      Documentation/filesystems/befs.txt
 F:     fs/befs/
 
 BECKHOFF CX5020 ETHERCAT MASTER DRIVER
-M: Dariusz Marcinkiewicz <reksio@newterm.pl>
-L: netdev@vger.kernel.org
-S: Maintained
-F: drivers/net/ethernet/ec_bhf.c
+M:     Dariusz Marcinkiewicz <reksio@newterm.pl>
+L:     netdev@vger.kernel.org
+S:     Maintained
+F:     drivers/net/ethernet/ec_bhf.c
 
 BFS FILE SYSTEM
 M:     "Tigran A. Aivazian" <tigran@aivazian.fsnet.co.uk>
@@ -2518,11 +2517,18 @@ F:      Documentation/zh_CN/
 
 CHIPIDEA USB HIGH SPEED DUAL ROLE CONTROLLER
 M:     Peter Chen <Peter.Chen@freescale.com>
-T:     git git://github.com/hzpeterchen/linux-usb.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git
 L:     linux-usb@vger.kernel.org
 S:     Maintained
 F:     drivers/usb/chipidea/
 
+CHIPONE ICN8318 I2C TOUCHSCREEN DRIVER
+M:     Hans de Goede <hdegoede@redhat.com>
+L:     linux-input@vger.kernel.org
+S:     Maintained
+F:     Documentation/devicetree/bindings/input/touchscreen/chipone_icn8318.txt
+F:     drivers/input/touchscreen/chipone_icn8318.c
+
 CHROME HARDWARE PLATFORM SUPPORT
 M:     Olof Johansson <olof@lixom.net>
 S:     Maintained
@@ -2563,6 +2569,7 @@ F:        include/linux/cleancache.h
 
 CLK API
 M:     Russell King <linux@arm.linux.org.uk>
+L:     linux-clk@vger.kernel.org
 S:     Maintained
 F:     include/linux/clk.h
 
@@ -2623,7 +2630,7 @@ F:        drivers/media/platform/coda/
 COMMON CLK FRAMEWORK
 M:     Mike Turquette <mturquette@linaro.org>
 M:     Stephen Boyd <sboyd@codeaurora.org>
-L:     linux-kernel@vger.kernel.org
+L:     linux-clk@vger.kernel.org
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git
 S:     Maintained
 F:     drivers/clk/
@@ -2816,6 +2823,7 @@ L:        linux-crypto@vger.kernel.org
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git
 S:     Maintained
 F:     Documentation/crypto/
+F:     Documentation/DocBook/crypto-API.tmpl
 F:     arch/*/crypto/
 F:     crypto/
 F:     drivers/crypto/
@@ -2886,11 +2894,11 @@ S:      Supported
 F:     drivers/net/ethernet/chelsio/cxgb3/
 
 CXGB3 ISCSI DRIVER (CXGB3I)
-M:      Karen Xie <kxie@chelsio.com>
-L:      linux-scsi@vger.kernel.org
-W:      http://www.chelsio.com
-S:      Supported
-F:      drivers/scsi/cxgbi/cxgb3i
+M:     Karen Xie <kxie@chelsio.com>
+L:     linux-scsi@vger.kernel.org
+W:     http://www.chelsio.com
+S:     Supported
+F:     drivers/scsi/cxgbi/cxgb3i
 
 CXGB3 IWARP RNIC DRIVER (IW_CXGB3)
 M:     Steve Wise <swise@chelsio.com>
@@ -2907,11 +2915,11 @@ S:      Supported
 F:     drivers/net/ethernet/chelsio/cxgb4/
 
 CXGB4 ISCSI DRIVER (CXGB4I)
-M:      Karen Xie <kxie@chelsio.com>
-L:      linux-scsi@vger.kernel.org
-W:      http://www.chelsio.com
-S:      Supported
-F:      drivers/scsi/cxgbi/cxgb4i
+M:     Karen Xie <kxie@chelsio.com>
+L:     linux-scsi@vger.kernel.org
+W:     http://www.chelsio.com
+S:     Supported
+F:     drivers/scsi/cxgbi/cxgb4i
 
 CXGB4 IWARP RNIC DRIVER (IW_CXGB4)
 M:     Steve Wise <swise@chelsio.com>
@@ -3058,10 +3066,16 @@ F:      drivers/net/fddi/defxx.*
 
 DELL LAPTOP DRIVER
 M:     Matthew Garrett <mjg59@srcf.ucam.org>
+M:     Pali Rohár <pali.rohar@gmail.com>
 L:     platform-driver-x86@vger.kernel.org
 S:     Maintained
 F:     drivers/platform/x86/dell-laptop.c
 
+DELL LAPTOP FREEFALL DRIVER
+M:     Pali Rohár <pali.rohar@gmail.com>
+S:     Maintained
+F:     drivers/platform/x86/dell-smo8800.c
+
 DELL LAPTOP SMM DRIVER
 M:     Guenter Roeck <linux@roeck-us.net>
 S:     Maintained
@@ -3076,6 +3090,7 @@ F:        drivers/firmware/dcdbas.*
 
 DELL WMI EXTRAS DRIVER
 M:     Matthew Garrett <mjg59@srcf.ucam.org>
+M:     Pali Rohár <pali.rohar@gmail.com>
 S:     Maintained
 F:     drivers/platform/x86/dell-wmi.c
 
@@ -3137,12 +3152,15 @@ S:      Supported
 F:     Documentation/hwmon/da90??
 F:     drivers/gpio/gpio-da90??.c
 F:     drivers/hwmon/da90??-hwmon.c
+F:     drivers/iio/adc/da91??-*.c
 F:     drivers/input/misc/da90??_onkey.c
 F:     drivers/input/touchscreen/da9052_tsi.c
 F:     drivers/leds/leds-da90??.c
 F:     drivers/mfd/da903x.c
 F:     drivers/mfd/da90??-*.c
+F:     drivers/mfd/da91??-*.c
 F:     drivers/power/da9052-battery.c
+F:     drivers/power/da91??-*.c
 F:     drivers/regulator/da903x.c
 F:     drivers/regulator/da9???-regulator.[ch]
 F:     drivers/rtc/rtc-da90??.c
@@ -3152,6 +3170,7 @@ F:        include/linux/mfd/da903x.h
 F:     include/linux/mfd/da9052/
 F:     include/linux/mfd/da9055/
 F:     include/linux/mfd/da9063/
+F:     include/linux/mfd/da9150/
 F:     include/sound/da[79]*.h
 F:     sound/soc/codecs/da[79]*.[ch]
 
@@ -3259,12 +3278,6 @@ F:       drivers/firmware/dmi-id.c
 F:     drivers/firmware/dmi_scan.c
 F:     include/linux/dmi.h
 
-DOCKING STATION DRIVER
-M:     Shaohua Li <shaohua.li@intel.com>
-L:     linux-acpi@vger.kernel.org
-S:     Supported
-F:     drivers/acpi/dock.c
-
 DOCUMENTATION
 M:     Jonathan Corbet <corbet@lwn.net>
 L:     linux-doc@vger.kernel.org
@@ -3272,7 +3285,9 @@ S:        Maintained
 F:     Documentation/
 X:     Documentation/ABI/
 X:     Documentation/devicetree/
-X:     Documentation/[a-z][a-z]_[A-Z][A-Z]/
+X:     Documentation/acpi
+X:     Documentation/power
+X:     Documentation/spi
 T:     git git://git.lwn.net/linux-2.6.git docs-next
 
 DOUBLETALK DRIVER
@@ -4169,6 +4184,12 @@ F:       sound/soc/fsl/fsl*
 F:     sound/soc/fsl/imx*
 F:     sound/soc/fsl/mpc8610_hpcd.c
 
+FREESCALE QORIQ MANAGEMENT COMPLEX DRIVER
+M:     J. German Rivera <German.Rivera@freescale.com>
+L:     linux-kernel@vger.kernel.org
+S:     Maintained
+F:     drivers/staging/fsl-mc/
+
 FREEVXFS FILESYSTEM
 M:     Christoph Hellwig <hch@infradead.org>
 W:     ftp://ftp.openlinux.org/pub/people/hch/vxfs
@@ -4318,6 +4339,15 @@ S:       Supported
 F:     drivers/phy/
 F:     include/linux/phy/
 
+GENERIC PM DOMAINS
+M:     "Rafael J. Wysocki" <rjw@rjwysocki.net>
+M:     Kevin Hilman <khilman@kernel.org>
+M:     Ulf Hansson <ulf.hansson@linaro.org>
+L:     linux-pm@vger.kernel.org
+S:     Supported
+F:     drivers/base/power/domain*.c
+F:     include/linux/pm_domain.h
+
 GENERIC UIO DRIVER FOR PCI DEVICES
 M:     "Michael S. Tsirkin" <mst@redhat.com>
 L:     kvm@vger.kernel.org
@@ -4331,10 +4361,10 @@ F:      scripts/get_maintainer.pl
 
 GFS2 FILE SYSTEM
 M:     Steven Whitehouse <swhiteho@redhat.com>
+M:     Bob Peterson <rpeterso@redhat.com>
 L:     cluster-devel@redhat.com
 W:     http://sources.redhat.com/cluster/
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-fixes.git
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-nmw.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git
 S:     Supported
 F:     Documentation/filesystems/gfs2*.txt
 F:     fs/gfs2/
@@ -4444,7 +4474,7 @@ S:        Maintained
 F:     block/partitions/efi.*
 
 STK1160 USB VIDEO CAPTURE DRIVER
-M:     Ezequiel Garcia <elezegarcia@gmail.com>
+M:     Ezequiel Garcia <ezequiel@vanguardiasur.com.ar>
 L:     linux-media@vger.kernel.org
 T:     git git://linuxtv.org/media_tree.git
 S:     Maintained
@@ -4954,6 +4984,7 @@ S:        Maintained
 F:     drivers/iio/
 F:     drivers/staging/iio/
 F:     include/linux/iio/
+F:     tools/iio/
 
 IKANOS/ADI EAGLE ADSL USB DRIVER
 M:     Matthieu Castet <castet.matthieu@free.fr>
@@ -4986,6 +5017,11 @@ W:       http://industrypack.sourceforge.net
 S:     Maintained
 F:     drivers/ipack/
 
+INGENIC JZ4780 DMA Driver
+M:     Zubair Lutfullah Kakakhel <Zubair.Kakakhel@imgtec.com>
+S:     Maintained
+F:     drivers/dma/dma-jz4780.c
+
 INTEGRITY MEASUREMENT ARCHITECTURE (IMA)
 M:     Mimi Zohar <zohar@linux.vnet.ibm.com>
 M:     Dmitry Kasatkin <dmitry.kasatkin@gmail.com>
@@ -5199,7 +5235,7 @@ F:        arch/x86/kernel/tboot.c
 INTEL WIRELESS WIMAX CONNECTION 2400
 M:     Inaky Perez-Gonzalez <inaky.perez-gonzalez@intel.com>
 M:     linux-wimax@intel.com
-L:     wimax@linuxwimax.org (subscribers-only)
+L:     wimax@linuxwimax.org (subscribers-only)
 S:     Supported
 W:     http://linuxwimax.org
 F:     Documentation/wimax/README.i2400m
@@ -5277,6 +5313,13 @@ F:       drivers/char/ipmi/
 F:     include/linux/ipmi*
 F:     include/uapi/linux/ipmi*
 
+QCOM AUDIO (ASoC) DRIVERS
+M:     Patrick Lai <plai@codeaurora.org>
+M:     Banajit Goswami <bgoswami@codeaurora.org>
+L:     alsa-devel@alsa-project.org (moderated for non-subscribers)
+S:     Supported
+F:     sound/soc/qcom/
+
 IPS SCSI RAID DRIVER
 M:     Adaptec OEM Raid Solutions <aacraid@adaptec.com>
 L:     linux-scsi@vger.kernel.org
@@ -5597,6 +5640,8 @@ S:        Supported
 F:     Documentation/*/kvm*.txt
 F:     Documentation/virtual/kvm/
 F:     arch/*/kvm/
+F:     arch/x86/kernel/kvm.c
+F:     arch/x86/kernel/kvmclock.c
 F:     arch/*/include/asm/kvm*
 F:     include/linux/kvm*
 F:     include/uapi/linux/kvm*
@@ -5893,7 +5938,7 @@ F:        arch/powerpc/platforms/512x/
 F:     arch/powerpc/platforms/52xx/
 
 LINUX FOR POWERPC EMBEDDED PPC4XX
-M:  Alistair Popple <alistair@popple.id.au>
+M:     Alistair Popple <alistair@popple.id.au>
 M:     Matt Porter <mporter@kernel.crashing.org>
 W:     http://www.penguinppc.org/
 L:     linuxppc-dev@lists.ozlabs.org
@@ -6126,16 +6171,6 @@ Q:       http://patchwork.linuxtv.org/project/linux-media/list/
 S:     Maintained
 F:     drivers/media/dvb-frontends/m88rs2000*
 
-M88TS2022 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/m88ts2022*
-
 MA901 MASTERKIT USB FM RADIO DRIVER
 M:     Alexey Klimov <klimov.linux@gmail.com>
 L:     linux-media@vger.kernel.org
@@ -6328,6 +6363,7 @@ F:        drivers/scsi/megaraid/
 
 MELLANOX ETHERNET DRIVER (mlx4_en)
 M:     Amir Vadai <amirv@mellanox.com>
+M:     Ido Shamay <idos@mellanox.com>
 L:     netdev@vger.kernel.org
 S:     Supported
 W:     http://www.mellanox.com
@@ -6365,7 +6401,7 @@ S:        Supported
 F:     drivers/watchdog/mena21_wdt.c
 
 MEN CHAMELEON BUS (mcb)
-M:     Johannes Thumshirn <johannes.thumshirn@men.de>
+M:     Johannes Thumshirn <johannes.thumshirn@men.de>
 S:     Supported
 F:     drivers/mcb/
 F:     include/linux/mcb.h
@@ -6558,6 +6594,7 @@ M:        Laurent Pinchart <laurent.pinchart@ideasonboard.com>
 L:     linux-media@vger.kernel.org
 T:     git git://linuxtv.org/media_tree.git
 S:     Maintained
+F:     Documentation/devicetree/bindings/media/i2c/mt9v032.txt
 F:     drivers/media/i2c/mt9v032.c
 F:     include/media/mt9v032.h
 
@@ -6570,10 +6607,8 @@ F:       drivers/mfd/
 F:     include/linux/mfd/
 
 MULTIMEDIA CARD (MMC), SECURE DIGITAL (SD) AND SDIO SUBSYSTEM
-M:     Chris Ball <chris@printf.net>
 M:     Ulf Hansson <ulf.hansson@linaro.org>
 L:     linux-mmc@vger.kernel.org
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc.git
 T:     git git://git.linaro.org/people/ulf.hansson/mmc.git
 S:     Maintained
 F:     drivers/mmc/
@@ -6949,6 +6984,13 @@ S:       Supported
 F:     drivers/block/nvme*
 F:     include/linux/nvme.h
 
+NXP-NCI NFC DRIVER
+M:     Clément Perrochaud <clement.perrochaud@effinnov.com>
+R:     Charles Gorand <charles.gorand@effinnov.com>
+L:     linux-nfc@lists.01.org (moderated for non-subscribers)
+S:     Supported
+F:     drivers/nfc/nxp-nci
+
 NXP TDA998X DRM DRIVER
 M:     Russell King <rmk+kernel@arm.linux.org.uk>
 S:     Supported
@@ -6970,6 +7012,8 @@ Q:        http://patchwork.kernel.org/project/linux-omap/list/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git
 S:     Maintained
 F:     arch/arm/*omap*/
+F:     arch/arm/configs/omap1_defconfig
+F:     arch/arm/configs/omap2plus_defconfig
 F:     drivers/i2c/busses/i2c-omap.c
 F:     drivers/irqchip/irq-omap-intc.c
 F:     drivers/mfd/*omap*.c
@@ -7100,6 +7144,7 @@ OMAP IMAGING SUBSYSTEM (OMAP3 ISP and OMAP4 ISS)
 M:     Laurent Pinchart <laurent.pinchart@ideasonboard.com>
 L:     linux-media@vger.kernel.org
 S:     Maintained
+F:     Documentation/devicetree/bindings/media/ti,omap3isp.txt
 F:     drivers/media/platform/omap3isp/
 F:     drivers/staging/media/omap4iss/
 
@@ -7501,7 +7546,6 @@ S:        Maintained
 F:     drivers/pci/host/pci-exynos.c
 
 PCI DRIVER FOR SYNOPSIS DESIGNWARE
-M:     Mohit Kumar <mohit.kumar@st.com>
 M:     Jingoo Han <jg1.han@samsung.com>
 L:     linux-pci@vger.kernel.org
 S:     Maintained
@@ -7516,9 +7560,8 @@ F:        Documentation/devicetree/bindings/pci/host-generic-pci.txt
 F:     drivers/pci/host/pci-host-generic.c
 
 PCIE DRIVER FOR ST SPEAR13XX
-M:     Mohit Kumar <mohit.kumar@st.com>
 L:     linux-pci@vger.kernel.org
-S:     Maintained
+S:     Orphan
 F:     drivers/pci/host/*spear*
 
 PCMCIA SUBSYSTEM
@@ -7925,10 +7968,10 @@ L:      rtc-linux@googlegroups.com
 S:     Maintained
 
 QAT DRIVER
-M:      Tadeusz Struk <tadeusz.struk@intel.com>
-L:      qat-linux@intel.com
-S:      Supported
-F:      drivers/crypto/qat/
+M:     Tadeusz Struk <tadeusz.struk@intel.com>
+L:     qat-linux@intel.com
+S:     Supported
+F:     drivers/crypto/qat/
 
 QIB DRIVER
 M:     Mike Marciniszyn <infinipath@intel.com>
@@ -8079,11 +8122,17 @@ S:      Maintained
 F:     drivers/net/wireless/rt2x00/
 
 RAMDISK RAM BLOCK DEVICE DRIVER
-M:     Nick Piggin <npiggin@kernel.dk>
+M:     Jens Axboe <axboe@kernel.dk>
 S:     Maintained
 F:     Documentation/blockdev/ramdisk.txt
 F:     drivers/block/brd.c
 
+PERSISTENT MEMORY DRIVER
+M:     Ross Zwisler <ross.zwisler@linux.intel.com>
+L:     linux-nvdimm@lists.01.org
+S:     Supported
+F:     drivers/block/pmem.c
+
 RANDOM NUMBER DRIVER
 M:     "Theodore Ts'o" <tytso@mit.edu>
 S:     Maintained
@@ -8155,6 +8204,7 @@ X:        kernel/torture.c
 
 REAL TIME CLOCK (RTC) SUBSYSTEM
 M:     Alessandro Zummo <a.zummo@towertech.it>
+M:     Alexandre Belloni <alexandre.belloni@free-electrons.com>
 L:     rtc-linux@googlegroups.com
 Q:     http://patchwork.ozlabs.org/project/rtc-linux/list/
 S:     Maintained
@@ -8366,7 +8416,6 @@ F:        block/partitions/ibm.c
 
 S390 NETWORK DRIVERS
 M:     Ursula Braun <ursula.braun@de.ibm.com>
-M:     Frank Blaschka <blaschka@linux.vnet.ibm.com>
 M:     linux390@de.ibm.com
 L:     linux-s390@vger.kernel.org
 W:     http://www.ibm.com/developerworks/linux/linux390/
@@ -8574,6 +8623,7 @@ F:        include/uapi/linux/timex.h
 F:     kernel/time/clocksource.c
 F:     kernel/time/time*.c
 F:     kernel/time/ntp.c
+F:     tools/testing/selftests/timers/
 
 SC1200 WDT DRIVER
 M:     Zwane Mwaikambo <zwanem@gmail.com>
@@ -8625,11 +8675,9 @@ F:       drivers/scsi/sg.c
 F:     include/scsi/sg.h
 
 SCSI SUBSYSTEM
-M:     "James E.J. Bottomley" <JBottomley@parallels.com>
+M:     "James E.J. Bottomley" <JBottomley@odin.com>
 L:     linux-scsi@vger.kernel.org
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6.git
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6.git
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-pending-2.6.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git
 S:     Maintained
 F:     drivers/scsi/
 F:     include/scsi/
@@ -8682,10 +8730,8 @@ S:       Maintained
 F:     drivers/mmc/host/sdricoh_cs.c
 
 SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) DRIVER
-M:     Chris Ball <chris@printf.net>
 L:     linux-mmc@vger.kernel.org
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc.git
-S:     Maintained
+S:     Orphan
 F:     drivers/mmc/host/sdhci.*
 F:     drivers/mmc/host/sdhci-pltfm.[ch]
 
@@ -8701,18 +8747,12 @@ F:      include/linux/seccomp.h
 K:     \bsecure_computing
 K:     \bTIF_SECCOMP\b
 
-SECURE DIGITAL HOST CONTROLLER INTERFACE, OPEN FIRMWARE BINDINGS (SDHCI-OF)
-M:     Anton Vorontsov <anton@enomsg.org>
-L:     linuxppc-dev@lists.ozlabs.org
-L:     linux-mmc@vger.kernel.org
-S:     Maintained
-F:     drivers/mmc/host/sdhci-pltfm.[ch]
-
 SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) SAMSUNG DRIVER
 M:     Ben Dooks <ben-linux@fluff.org>
+M:     Jaehoon Chung <jh80.chung@samsung.com>
 L:     linux-mmc@vger.kernel.org
 S:     Maintained
-F:     drivers/mmc/host/sdhci-s3c.c
+F:     drivers/mmc/host/sdhci-s3c*
 
 SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) ST SPEAR DRIVER
 M:     Viresh Kumar <viresh.linux@gmail.com>
@@ -8776,6 +8816,15 @@ W:       http://www.emulex.com
 S:     Supported
 F:     drivers/net/ethernet/emulex/benet/
 
+EMULEX ONECONNECT ROCE DRIVER
+M:     Selvin Xavier <selvin.xavier@emulex.com>
+M:     Devesh Sharma <devesh.sharma@emulex.com>
+M:     Mitesh Ahuja <mitesh.ahuja@emulex.com>
+L:     linux-rdma@vger.kernel.org
+W:     http://www.emulex.com
+S:     Supported
+F:     drivers/infiniband/hw/ocrdma/
+
 SFC NETWORK DRIVER
 M:     Solarflare linux maintainers <linux-net-drivers@solarflare.com>
 M:     Shradha Shah <sshah@solarflare.com>
@@ -8949,6 +8998,16 @@ T:       git git://linuxtv.org/mhadli/v4l-dvb-davinci_devices.git
 S:     Maintained
 F:     drivers/media/platform/am437x/
 
+OV2659 OMNIVISION SENSOR DRIVER
+M:     Lad, Prabhakar <prabhakar.csengg@gmail.com>
+L:     linux-media@vger.kernel.org
+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:     Maintained
+F:     drivers/media/i2c/ov2659.c
+F:     include/media/ov2659.h
+
 SIS 190 ETHERNET DRIVER
 M:     Francois Romieu <romieu@fr.zoreil.com>
 L:     netdev@vger.kernel.org
@@ -9379,6 +9438,14 @@ L:       linux-fbdev@vger.kernel.org
 S:     Maintained
 F:     drivers/staging/sm7xxfb/
 
+STAGING - SILICON MOTION SM750 FRAME BUFFER DRIVER
+M:     Sudip Mukherjee <sudipm.mukherjee@gmail.com>
+M:     Teddy Wang <teddy.wang@siliconmotion.com>
+M:     Sudip Mukherjee <sudip@vectorindia.org>
+L:     linux-fbdev@vger.kernel.org
+S:     Maintained
+F:     drivers/staging/sm750fb/
+
 STAGING - SLICOSS
 M:     Lior Dotan <liodot@gmail.com>
 M:     Christopher Harrer <charrer@alacritech.com>
@@ -9841,7 +9908,7 @@ F:        include/linux/wl12xx.h
 
 TIPC NETWORK LAYER
 M:     Jon Maloy <jon.maloy@ericsson.com>
-M:     Allan Stephens <allan.stephens@windriver.com>
+M:     Ying Xue <ying.xue@windriver.com>
 L:     netdev@vger.kernel.org (core kernel code)
 L:     tipc-discussion@lists.sourceforge.net (user apps, general discussion)
 W:     http://tipc.sourceforge.net/
@@ -9890,10 +9957,23 @@ S:      Maintained
 F:     drivers/platform/x86/topstar-laptop.c
 
 TOSHIBA ACPI EXTRAS DRIVER
+M:     Azael Avalos <coproscefalo@gmail.com>
 L:     platform-driver-x86@vger.kernel.org
-S:     Orphan
+S:     Maintained
 F:     drivers/platform/x86/toshiba_acpi.c
 
+TOSHIBA BLUETOOTH DRIVER
+M:     Azael Avalos <coproscefalo@gmail.com>
+L:     platform-driver-x86@vger.kernel.org
+S:     Maintained
+F:     drivers/platform/x86/toshiba_bluetooth.c
+
+TOSHIBA HDD ACTIVE PROTECTION SENSOR DRIVER
+M:     Azael Avalos <coproscefalo@gmail.com>
+L:     platform-driver-x86@vger.kernel.org
+S:     Maintained
+F:     drivers/platform/x86/toshiba_haps.c
+
 TOSHIBA SMM DRIVER
 M:     Jonathan Buzzard <jonathan@buzzard.org.uk>
 L:     tlinux-users@tce.toshiba-dme.co.jp
@@ -9945,6 +10025,7 @@ F:       drivers/media/pci/tw68/
 TPM DEVICE DRIVER
 M:     Peter Huewe <peterhuewe@gmx.de>
 M:     Marcel Selhorst <tpmdd@selhorst.net>
+R:     Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
 W:     http://tpmdd.sourceforge.net
 L:     tpmdd-devel@lists.sourceforge.net (moderated for non-subscribers)
 Q:     git git://github.com/PeterHuewe/linux-tpmdd.git
@@ -10098,11 +10179,11 @@ F:    include/linux/cdrom.h
 F:     include/uapi/linux/cdrom.h
 
 UNISYS S-PAR DRIVERS
-M:     Benjamin Romer <benjamin.romer@unisys.com>
-M:     David Kershner <david.kershner@unisys.com>
-L:     sparmaintainer@unisys.com (Unisys internal)
-S:     Supported
-F:     drivers/staging/unisys/
+M:     Benjamin Romer <benjamin.romer@unisys.com>
+M:     David Kershner <david.kershner@unisys.com>
+L:     sparmaintainer@unisys.com (Unisys internal)
+S:     Supported
+F:     drivers/staging/unisys/
 
 UNIVERSAL FLASH STORAGE HOST CONTROLLER DRIVER
 M:     Vinayak Holikatti <vinholikatti@gmail.com>
@@ -10150,6 +10231,12 @@ S:     Maintained
 F:     drivers/net/usb/cdc_*.c
 F:     include/uapi/linux/usb/cdc.h
 
+USB CHAOSKEY DRIVER
+M:     Keith Packard <keithp@keithp.com>
+L:     linux-usb@vger.kernel.org
+S:     Maintained
+F:     drivers/usb/misc/chaoskey.c
+
 USB CYPRESS C67X00 DRIVER
 M:     Peter Korsgaard <jacmet@sunsite.dk>
 L:     linux-usb@vger.kernel.org
@@ -10230,7 +10317,7 @@ F:      drivers/usb/host/ohci*
 
 USB OTG FSM (Finite State Machine)
 M:     Peter Chen <Peter.Chen@freescale.com>
-T:     git git://github.com/hzpeterchen/linux-usb.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git
 L:     linux-usb@vger.kernel.org
 S:     Maintained
 F:     drivers/usb/common/usb-otg-fsm.c
@@ -10443,7 +10530,6 @@ F:      include/linux/virtio_console.h
 F:     include/uapi/linux/virtio_console.h
 
 VIRTIO CORE, NET AND BLOCK DRIVERS
-M:     Rusty Russell <rusty@rustcorp.com.au>
 M:     "Michael S. Tsirkin" <mst@redhat.com>
 L:     virtualization@lists.linux-foundation.org
 S:     Maintained
@@ -10463,6 +10549,12 @@ S:     Maintained
 F:     drivers/vhost/
 F:     include/uapi/linux/vhost.h
 
+VIRTIO INPUT DRIVER
+M:     Gerd Hoffmann <kraxel@redhat.com>
+S:     Maintained
+F:     drivers/virtio/virtio_input.c
+F:     include/uapi/linux/virtio_input.h
+
 VIA RHINE NETWORK DRIVER
 M:     Roger Luethi <rl@hellgate.ch>
 S:     Maintained
@@ -10538,6 +10630,14 @@ L:     linux-kernel@vger.kernel.org
 S:     Maintained
 F:     drivers/misc/vmw_balloon.c
 
+VMWARE VMMOUSE SUBDRIVER
+M:     "VMware Graphics" <linux-graphics-maintainer@vmware.com>
+M:     "VMware, Inc." <pv-drivers@vmware.com>
+L:     linux-input@vger.kernel.org
+S:     Maintained
+F:     drivers/input/mouse/vmmouse.c
+F:     drivers/input/mouse/vmmouse.h
+
 VMWARE VMXNET3 ETHERNET DRIVER
 M:     Shreyas Bhatewara <sbhatewara@vmware.com>
 M:     "VMware, Inc." <pv-drivers@vmware.com>
@@ -10653,7 +10753,7 @@ F:      drivers/media/rc/winbond-cir.c
 WIMAX STACK
 M:     Inaky Perez-Gonzalez <inaky.perez-gonzalez@intel.com>
 M:     linux-wimax@intel.com
-L:     wimax@linuxwimax.org (subscribers-only)
+L:     wimax@linuxwimax.org (subscribers-only)
 S:     Supported
 W:     http://linuxwimax.org
 F:     Documentation/wimax/README.wimax
@@ -10863,6 +10963,16 @@ L:     linux-serial@vger.kernel.org
 S:     Maintained
 F:     drivers/tty/serial/uartlite.c
 
+XILINX VIDEO IP CORES
+M:     Hyun Kwon <hyun.kwon@xilinx.com>
+M:     Laurent Pinchart <laurent.pinchart@ideasonboard.com>
+L:     linux-media@vger.kernel.org
+T:     git git://linuxtv.org/media_tree.git
+S:     Supported
+F:     Documentation/devicetree/bindings/media/xilinx/
+F:     drivers/media/platform/xilinx/
+F:     include/uapi/linux/xilinx-v4l2-controls.h
+
 XILLYBUS DRIVER
 M:     Eli Billauer <eli.billauer@gmail.com>
 L:     linux-kernel@vger.kernel.org
@@ -10944,6 +11054,7 @@ L:      linux-mm@kvack.org
 S:     Maintained
 F:     mm/zsmalloc.c
 F:     include/linux/zsmalloc.h
+F:     Documentation/vm/zsmalloc.txt
 
 ZSWAP COMPRESSED SWAP CACHING
 M:     Seth Jennings <sjennings@variantweb.net>