Merge tag 'v3.16-rc6' into next

Merge with mainline to bring in changes to MFD to allow merging
ipaq-micro-ts driver.

1 files changed, 258 insertions, 123 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index c68bd8b6f8e9..170472022f10 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -156,7 +156,6 @@ F:	drivers/net/hamradio/6pack.c
 
 8169 10/100/1000 GIGABIT ETHERNET DRIVER
 M:      Realtek linux nic maintainers <nic_swsd@realtek.com>
-M:      Francois Romieu <romieu@fr.zoreil.com>
 L:      netdev@vger.kernel.org
 S:      Maintained
 F:      drivers/net/ethernet/realtek/r8169.c
@@ -210,6 +209,13 @@ S:	Supported
 F:      Documentation/scsi/aacraid.txt
 F:      drivers/scsi/aacraid/
 
+ABI/API
+L:      linux-api@vger.kernel.org
+F:      Documentation/ABI/
+F:      include/linux/syscalls.h
+F:      include/uapi/
+F:      kernel/sys_ni.c
+
 ABIT UGURU 1,2 HARDWARE MONITOR DRIVER
 M:      Hans de Goede <hdegoede@redhat.com>
 L:      lm-sensors@lm-sensors.org
@@ -355,7 +361,7 @@ F:	Documentation/hwmon/adm1025
 F:      drivers/hwmon/adm1025.c
 
 ADM1029 HARDWARE MONITOR DRIVER
-M:      Corentin Labbe <corentin.labbe@geomatys.fr>
+M:      Corentin Labbe <clabbe.montjoie@gmail.com>
 L:      lm-sensors@lm-sensors.org
 S:      Maintained
 F:      drivers/hwmon/adm1029.c
@@ -537,7 +543,7 @@ L:	linux-alpha@vger.kernel.org
 F:      arch/alpha/
 
 ALTERA TRIPLE SPEED ETHERNET DRIVER
-M:      Vince Bridgers <vbridgers2013@gmail.com
+M:      Vince Bridgers <vbridgers2013@gmail.com>
 L:      netdev@vger.kernel.org
 L:      nios2-dev@lists.rocketboards.org (moderated for non-subscribers)
 S:      Maintained
@@ -597,6 +603,13 @@ L:	amd64-microcode@amd64.org
 S:      Maintained
 F:      arch/x86/kernel/microcode_amd.c
 
+AMD XGBE DRIVER
+M:      Tom Lendacky <thomas.lendacky@amd.com>
+L:      netdev@vger.kernel.org
+S:      Supported
+F:      drivers/net/ethernet/amd/xgbe/
+F:      drivers/net/phy/amd-xgbe-phy.c
+
 AMS (Apple Motion Sensor) DRIVER
 M:      Michael Hanselmann <linux-kernel@hansmi.ch>
 S:      Supported
@@ -647,7 +660,7 @@ F:	sound/soc/codecs/ssm*
 F:      sound/soc/codecs/sigmadsp.*
 
 ANALOG DEVICES INC ASOC DRIVERS
-L:      adi-buildroot-devel@lists.sourceforge.net
+L:      adi-buildroot-devel@lists.sourceforge.net (moderated for non-subscribers)
 L:      alsa-devel@alsa-project.org (moderated for non-subscribers)
 W:      http://blackfin.uclinux.org/
 S:      Supported
@@ -808,6 +821,11 @@ F:	arch/arm/boot/dts/at91*.dtsi
 F:      arch/arm/boot/dts/sama*.dts
 F:      arch/arm/boot/dts/sama*.dtsi
 
+ARM/ATMEL AT91 Clock Support
+M:      Boris Brezillon <boris.brezillon@free-electrons.com>
+S:      Maintained
+F:      drivers/clk/at91
+
 ARM/CALXEDA HIGHBANK ARCHITECTURE
 M:      Rob Herring <robh@kernel.org>
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@ -924,16 +942,10 @@ L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:      Maintained
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git
 F:      arch/arm/mach-imx/
+F:      arch/arm/mach-mxs/
 F:      arch/arm/boot/dts/imx*
 F:      arch/arm/configs/imx*_defconfig
 
-ARM/FREESCALE MXS ARM ARCHITECTURE
-M:      Shawn Guo <shawn.guo@linaro.org>
-L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
-S:      Maintained
-T:      git git://git.linaro.org/people/shawnguo/linux-2.6.git
-F:      arch/arm/mach-mxs/
-
 ARM/GLOMATION GESBC9312SX MACHINE SUPPORT
 M:      Lennert Buytenhek <kernel@wantstofly.org>
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@ -1033,9 +1045,33 @@ M:	Santosh Shilimkar <santosh.shilimkar@ti.com>
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:      Maintained
 F:      arch/arm/mach-keystone/
-F:      drivers/clk/keystone/
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git
 
+ARM/TEXAS INSTRUMENT KEYSTONE CLOCK FRAMEWORK
+M:      Santosh Shilimkar <santosh.shilimkar@ti.com>
+L:      linux-kernel@vger.kernel.org
+S:      Maintained
+F:      drivers/clk/keystone/
+
+ARM/TEXAS INSTRUMENT KEYSTONE ClOCKSOURCE
+M:      Santosh Shilimkar <santosh.shilimkar@ti.com>
+L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+L:      linux-kernel@vger.kernel.org
+S:      Maintained
+F:      drivers/clocksource/timer-keystone.c
+
+ARM/TEXAS INSTRUMENT KEYSTONE RESET DRIVER
+M:      Santosh Shilimkar <santosh.shilimkar@ti.com>
+L:      linux-kernel@vger.kernel.org
+S:      Maintained
+F:      drivers/power/reset/keystone-reset.c
+
+ARM/TEXAS INSTRUMENT AEMIF/EMIF DRIVERS
+M:      Santosh Shilimkar <santosh.shilimkar@ti.com>
+L:      linux-kernel@vger.kernel.org
+S:      Maintained
+F:      drivers/memory/*emif*
+
 ARM/LOGICPD PXA270 MACHINE SUPPORT
 M:      Lennert Buytenhek <kernel@wantstofly.org>
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@ -1277,6 +1313,20 @@ W:	http://oss.renesas.com
 Q:      http://patchwork.kernel.org/project/linux-sh/list/
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git next
 S:      Supported
+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/genmai_defconfig
+F:      arch/arm/configs/koelsch_defconfig
+F:      arch/arm/configs/kzm9g_defconfig
+F:      arch/arm/configs/lager_defconfig
+F:      arch/arm/configs/mackerel_defconfig
+F:      arch/arm/configs/marzen_defconfig
+F:      arch/arm/configs/shmobile_defconfig
 F:      arch/arm/mach-shmobile/
 F:      drivers/sh/
 
@@ -1617,12 +1667,6 @@ S:	Supported
 F:      drivers/misc/atmel_tclib.c
 F:      drivers/clocksource/tcb_clksrc.c
 
-ATMEL TSADCC DRIVER
-M:      Josh Wu <josh.wu@atmel.com>
-L:      linux-input@vger.kernel.org
-S:      Supported
-F:      drivers/input/touchscreen/atmel_tsadcc.c
-
 ATMEL USBA UDC DRIVER
 M:      Nicolas Ferre <nicolas.ferre@atmel.com>
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@ -1764,54 +1808,54 @@ F:	include/uapi/linux/bfs_fs.h
 
 BLACKFIN ARCHITECTURE
 M:      Steven Miao <realmz6@gmail.com>
-L:      adi-buildroot-devel@lists.sourceforge.net
+L:      adi-buildroot-devel@lists.sourceforge.net (moderated for non-subscribers)
 T:      git git://git.code.sf.net/p/adi-linux/code
 W:      http://blackfin.uclinux.org
 S:      Supported
 F:      arch/blackfin/
 
 BLACKFIN EMAC DRIVER
-L:      adi-buildroot-devel@lists.sourceforge.net
+L:      adi-buildroot-devel@lists.sourceforge.net (moderated for non-subscribers)
 W:      http://blackfin.uclinux.org
 S:      Supported
 F:      drivers/net/ethernet/adi/
 
 BLACKFIN RTC DRIVER
-L:      adi-buildroot-devel@lists.sourceforge.net
+L:      adi-buildroot-devel@lists.sourceforge.net (moderated for non-subscribers)
 W:      http://blackfin.uclinux.org
 S:      Supported
 F:      drivers/rtc/rtc-bfin.c
 
 BLACKFIN SDH DRIVER
 M:      Sonic Zhang <sonic.zhang@analog.com>
-L:      adi-buildroot-devel@lists.sourceforge.net
+L:      adi-buildroot-devel@lists.sourceforge.net (moderated for non-subscribers)
 W:      http://blackfin.uclinux.org
 S:      Supported
 F:      drivers/mmc/host/bfin_sdh.c
 
 BLACKFIN SERIAL DRIVER
 M:      Sonic Zhang <sonic.zhang@analog.com>
-L:      adi-buildroot-devel@lists.sourceforge.net
+L:      adi-buildroot-devel@lists.sourceforge.net (moderated for non-subscribers)
 W:      http://blackfin.uclinux.org
 S:      Supported
 F:      drivers/tty/serial/bfin_uart.c
 
 BLACKFIN WATCHDOG DRIVER
-L:      adi-buildroot-devel@lists.sourceforge.net
+L:      adi-buildroot-devel@lists.sourceforge.net (moderated for non-subscribers)
 W:      http://blackfin.uclinux.org
 S:      Supported
 F:      drivers/watchdog/bfin_wdt.c
 
 BLACKFIN I2C TWI DRIVER
 M:      Sonic Zhang <sonic.zhang@analog.com>
-L:      adi-buildroot-devel@lists.sourceforge.net
+L:      adi-buildroot-devel@lists.sourceforge.net (moderated for non-subscribers)
 W:      http://blackfin.uclinux.org/
 S:      Supported
 F:      drivers/i2c/busses/i2c-bfin-twi.c
 
 BLACKFIN MEDIA DRIVER
 M:      Scott Jiang <scott.jiang.linux@gmail.com>
-L:      adi-buildroot-devel@lists.sourceforge.net
+L:      adi-buildroot-devel@lists.sourceforge.net (moderated for non-subscribers)
 W:      http://blackfin.uclinux.org/
 S:      Supported
 F:      drivers/media/platform/blackfin/
@@ -1888,19 +1932,20 @@ F:	drivers/net/ethernet/broadcom/bnx2.*
 F:      drivers/net/ethernet/broadcom/bnx2_*
 
 BROADCOM BNX2X 10 GIGABIT ETHERNET DRIVER
-M:      Ariel Elior <ariele@broadcom.com>
+M:      Ariel Elior <ariel.elior@qlogic.com>
 L:      netdev@vger.kernel.org
 S:      Supported
 F:      drivers/net/ethernet/broadcom/bnx2x/
 
-BROADCOM BCM281XX/BCM11XXX ARM ARCHITECTURE
+BROADCOM BCM281XX/BCM11XXX/BCM216XX ARM ARCHITECTURE
 M:      Christian Daudt <bcm@fixthebug.org>
 M:      Matt Porter <mporter@linaro.org>
 L:      bcm-kernel-feedback-list@broadcom.com
-T:      git git://git.github.com/broadcom/bcm11351
+T:      git git://github.com/broadcom/mach-bcm
 S:      Maintained
 F:      arch/arm/mach-bcm/
 F:      arch/arm/boot/dts/bcm113*
+F:      arch/arm/boot/dts/bcm216*
 F:      arch/arm/boot/dts/bcm281*
 F:      arch/arm/configs/bcm_defconfig
 F:      drivers/mmc/host/sdhci_bcm_kona.c
@@ -1967,6 +2012,12 @@ S:	Maintained
 F:      drivers/bcma/
 F:      include/linux/bcma/
 
+BROADCOM SYSTEMPORT ETHERNET DRIVER
+M:      Florian Fainelli <f.fainelli@gmail.com>
+L:      netdev@vger.kernel.org
+S:      Supported
+F:      drivers/net/ethernet/broadcom/bcmsysport.*
+
 BROCADE BFA FC SCSI DRIVER
 M:      Anil Gurumurthy <anil.gurumurthy@qlogic.com>
 M:      Sudarsana Kalluru <sudarsana.kalluru@qlogic.com>
@@ -2193,6 +2244,7 @@ T:	git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git
 S:      Supported
 F:      drivers/char/*
 F:      drivers/misc/*
+F:      include/linux/miscdevice.h
 
 CHECKPATCH
 M:      Andy Whitcroft <apw@canonical.com>
@@ -2222,9 +2274,8 @@ F:	drivers/platform/chrome/
 CISCO VIC ETHERNET NIC DRIVER
 M:      Christian Benvenuti <benve@cisco.com>
 M:      Sujith Sankar <ssujith@cisco.com>
-M:      Govindarajulu Varadarajan <govindarajulu90@gmail.com>
+M:      Govindarajulu Varadarajan <_govind@gmx.com>
 M:      Neel Patel <neepatel@cisco.com>
-M:      Nishank Trivedi <nistrive@cisco.com>
 S:      Supported
 F:      drivers/net/ethernet/cisco/enic/
 
@@ -2245,12 +2296,6 @@ L:	linux-usb@vger.kernel.org
 S:      Maintained
 F:      drivers/usb/host/ohci-ep93xx.c
 
-CIRRUS LOGIC CS4270 SOUND DRIVER
-M:      Timur Tabi <timur@tabi.org>
-L:      alsa-devel@alsa-project.org (moderated for non-subscribers)
-S:      Odd Fixes
-F:      sound/soc/codecs/cs4270*
-
 CIRRUS LOGIC AUDIO CODEC DRIVERS
 M:      Brian Austin <brian.austin@cirrus.com>
 M:      Paul Handrigan <Paul.Handrigan@cirrus.com>
@@ -2382,16 +2427,35 @@ L:	netdev@vger.kernel.org
 S:      Maintained
 F:      drivers/connector/
 
-CONTROL GROUPS (CGROUPS)
+CONTROL GROUP (CGROUP)
 M:      Tejun Heo <tj@kernel.org>
 M:      Li Zefan <lizefan@huawei.com>
-L:      containers@lists.linux-foundation.org
 L:      cgroups@vger.kernel.org
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git
 S:      Maintained
+F:      Documentation/cgroups/
 F:      include/linux/cgroup*
 F:      kernel/cgroup*
-F:      mm/*cgroup*
+
+CONTROL GROUP - CPUSET
+M:      Li Zefan <lizefan@huawei.com>
+L:      cgroups@vger.kernel.org
+W:      http://www.bullopensource.org/cpuset/
+W:      http://oss.sgi.com/projects/cpusets/
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git
+S:      Maintained
+F:      Documentation/cgroups/cpusets.txt
+F:      include/linux/cpuset.h
+F:      kernel/cpuset.c
+
+CONTROL GROUP - MEMORY RESOURCE CONTROLLER (MEMCG)
+M:      Johannes Weiner <hannes@cmpxchg.org>
+M:      Michal Hocko <mhocko@suse.cz>
+L:      cgroups@vger.kernel.org
+L:      linux-mm@kvack.org
+S:      Maintained
+F:      mm/memcontrol.c
+F:      mm/page_cgroup.c
 
 CORETEMP HARDWARE MONITORING DRIVER
 M:      Fenghua Yu <fenghua.yu@intel.com>
@@ -2415,7 +2479,6 @@ F:	drivers/net/ethernet/ti/cpmac.c
 CPU FREQUENCY DRIVERS
 M:      Rafael J. Wysocki <rjw@rjwysocki.net>
 M:      Viresh Kumar <viresh.kumar@linaro.org>
-L:      cpufreq@vger.kernel.org
 L:      linux-pm@vger.kernel.org
 S:      Maintained
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git
@@ -2426,7 +2489,6 @@ F:	include/linux/cpufreq.h
 CPU FREQUENCY DRIVERS - ARM BIG LITTLE
 M:      Viresh Kumar <viresh.kumar@linaro.org>
 M:      Sudeep Holla <sudeep.holla@arm.com>
-L:      cpufreq@vger.kernel.org
 L:      linux-pm@vger.kernel.org
 W:      http://www.arm.com/products/processors/technologies/biglittleprocessing.php
 S:      Maintained
@@ -2464,17 +2526,6 @@ M:	Thomas Renninger <trenn@suse.de>
 S:      Maintained
 F:      tools/power/cpupower/
 
-CPUSETS
-M:      Li Zefan <lizefan@huawei.com>
-L:      cgroups@vger.kernel.org
-W:      http://www.bullopensource.org/cpuset/
-W:      http://oss.sgi.com/projects/cpusets/
-T:      git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git
-S:      Maintained
-F:      Documentation/cgroups/cpusets.txt
-F:      include/linux/cpuset.h
-F:      kernel/cpuset.c
-
 CRAMFS FILESYSTEM
 W:      http://sourceforge.net/projects/cramfs/
 S:      Orphan / Obsolete
@@ -2574,7 +2625,7 @@ S:	Supported
 F:      drivers/infiniband/hw/cxgb3/
 
 CXGB4 ETHERNET DRIVER (CXGB4)
-M:      Dimitris Michailidis <dm@chelsio.com>
+M:      Hariprasad S <hariprasad@chelsio.com>
 L:      netdev@vger.kernel.org
 W:      http://www.chelsio.com
 S:      Supported
@@ -2692,6 +2743,15 @@ S:	Orphan
 F:      Documentation/networking/decnet.txt
 F:      net/decnet/
 
+DECSTATION PLATFORM SUPPORT
+M:      "Maciej W. Rozycki" <macro@linux-mips.org>
+L:      linux-mips@linux-mips.org
+W:      http://www.linux-mips.org/wiki/DECstation
+S:      Maintained
+F:      arch/mips/dec/
+F:      arch/mips/include/asm/dec/
+F:      arch/mips/include/asm/mach-dec/
+
 DEFXX FDDI NETWORK DRIVER
 M:      "Maciej W. Rozycki" <macro@linux-mips.org>
 S:      Maintained
@@ -2789,12 +2849,14 @@ F:	sound/soc/codecs/da[79]*.[ch]
 
 DIGI NEO AND CLASSIC PCI PRODUCTS
 M:      Lidza Louina <lidza.louina@gmail.com>
+M:      Mark Hounschell <markh@compro.net>
 L:      driverdev-devel@linuxdriverproject.org
 S:      Maintained
 F:      drivers/staging/dgnc/
 
 DIGI EPCA PCI PRODUCTS
 M:      Lidza Louina <lidza.louina@gmail.com>
+M:      Mark Hounschell <markh@compro.net>
 L:      driverdev-devel@linuxdriverproject.org
 S:      Maintained
 F:      drivers/staging/dgap/
@@ -2886,6 +2948,9 @@ L:	linux-doc@vger.kernel.org
 T:      quilt http://www.infradead.org/~rdunlap/Doc/patches/
 S:      Maintained
 F:      Documentation/
+X:      Documentation/ABI/
+X:      Documentation/devicetree/
+X:      Documentation/[a-z][a-z]_[A-Z][A-Z]/
 
 DOUBLETALK DRIVER
 M:      "James R. Van Zandt" <jrv@vanzandt.mv.com>
@@ -2933,6 +2998,7 @@ L:	dri-devel@lists.freedesktop.org
 T:      git git://people.freedesktop.org/~airlied/linux
 S:      Maintained
 F:      drivers/gpu/drm/
+F:      drivers/gpu/vga/
 F:      include/drm/
 F:      include/uapi/drm/
 
@@ -3157,15 +3223,6 @@ L:	linux-scsi@vger.kernel.org
 S:      Maintained
 F:      drivers/scsi/eata_pio.*
 
-EBTABLES
-M:      Bart De Schuymer <bart.de.schuymer@pandora.be>
-L:      netfilter-devel@vger.kernel.org
-W:      http://ebtables.sourceforge.net/
-S:      Maintained
-F:      include/linux/netfilter_bridge/ebt_*.h
-F:      include/uapi/linux/netfilter_bridge/ebt_*.h
-F:      net/bridge/netfilter/ebt*.c
-
 EC100 MEDIA DRIVER
 M:      Antti Palosaari <crope@iki.fi>
 L:      linux-media@vger.kernel.org
@@ -3774,7 +3831,8 @@ F:	fs/fscache/
 F:      include/linux/fscache*.h
 
 F2FS FILE SYSTEM
-M:      Jaegeuk Kim <jaegeuk.kim@samsung.com>
+M:      Jaegeuk Kim <jaegeuk@kernel.org>
+M:      Changman Lee <cm224.lee@samsung.com>
 L:      linux-f2fs-devel@lists.sourceforge.net
 W:      http://en.wikipedia.org/wiki/F2FS
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git
@@ -3892,6 +3950,11 @@ L:	kvm@vger.kernel.org
 S:      Supported
 F:      drivers/uio/uio_pci_generic.c
 
+GET_MAINTAINER SCRIPT
+M:      Joe Perches <joe@perches.com>
+S:      Maintained
+F:      scripts/get_maintainer.pl
+
 GFS2 FILE SYSTEM
 M:      Steven Whitehouse <swhiteho@redhat.com>
 L:      cluster-devel@redhat.com
@@ -4016,9 +4079,8 @@ S:	Odd Fixes
 F:      drivers/media/usb/hdpvr/
 
 HWPOISON MEMORY FAILURE HANDLING
-M:      Andi Kleen <andi@firstfloor.org>
+M:      Naoya Horiguchi <n-horiguchi@ah.jp.nec.com>
 L:      linux-mm@kvack.org
-T:      git git://git.kernel.org/pub/scm/linux/kernel/git/ak/linux-mce-2.6.git hwpoison
 S:      Maintained
 F:      mm/memory-failure.c
 F:      mm/hwpoison-inject.c
@@ -4209,9 +4271,11 @@ S:	Maintained
 F:      fs/hpfs/
 
 HSI SUBSYSTEM
-M:      Sebastian Reichel <sre@debian.org>
+M:      Sebastian Reichel <sre@kernel.org>
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi.git
 S:      Maintained
 F:      Documentation/ABI/testing/sysfs-bus-hsi
+F:      Documentation/hsi.txt
 F:      drivers/hsi/
 F:      include/linux/hsi/
 F:      include/uapi/linux/hsi/
@@ -4366,7 +4430,7 @@ S:	Supported
 F:      drivers/crypto/nx/
 
 IBM Power 842 compression accelerator
-M:      Robert Jennings <rcj@linux.vnet.ibm.com>
+M:      Nathan Fontenot <nfont@linux.vnet.ibm.com>
 S:      Supported
 F:      drivers/crypto/nx/nx-842.c
 F:      include/linux/nx842.h
@@ -4382,12 +4446,18 @@ 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>
+IBM Power Virtual SCSI Device Drivers
+M:      Nathan Fontenot <nfont@linux.vnet.ibm.com>
 L:      linux-scsi@vger.kernel.org
 S:      Supported
-F:      drivers/scsi/ibmvscsi/
-X:      drivers/scsi/ibmvscsi/ibmvstgt.c
+F:      drivers/scsi/ibmvscsi/ibmvscsi*
+F:      drivers/scsi/ibmvscsi/viosrp.h
+
+IBM Power Virtual FC Device Drivers
+M:      Brian King <brking@linux.vnet.ibm.com>
+L:      linux-scsi@vger.kernel.org
+S:      Supported
+F:      drivers/scsi/ibmvscsi/ibmvfc*
 
 IBM ServeRAID RAID DRIVER
 P:      Jack Hammer
@@ -4440,8 +4510,7 @@ S:	Supported
 F:      drivers/idle/i7300_idle.c
 
 IEEE 802.15.4 SUBSYSTEM
-M:      Alexander Smirnov <alex.bluesman.smirnov@gmail.com>
-M:      Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
+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
@@ -4818,6 +4887,14 @@ L:	linux-kernel@vger.kernel.org
 S:      Maintained
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git irq/core
 F:      kernel/irq/
+
+IRQCHIP DRIVERS
+M:      Thomas Gleixner <tglx@linutronix.de>
+M:      Jason Cooper <jason@lakedaemon.net>
+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:      drivers/irqchip/
 
 IRQ DOMAINS (IRQ NUMBER MAPPING LIBRARY)
@@ -5465,10 +5542,11 @@ S:	Maintained
 F:      arch/arm/mach-lpc32xx/
 
 LSILOGIC MPT FUSION DRIVERS (FC/SAS/SPI)
-M:      Nagalakshmi Nandigama <Nagalakshmi.Nandigama@lsi.com>
-M:      Sreekanth Reddy <Sreekanth.Reddy@lsi.com>
-M:      support@lsi.com
-L:      DL-MPTFusionLinux@lsi.com
+M:      Nagalakshmi Nandigama <nagalakshmi.nandigama@avagotech.com>
+M:      Praveen Krishnamoorthy <praveen.krishnamoorthy@avagotech.com>
+M:      Sreekanth Reddy <sreekanth.reddy@avagotech.com>
+M:      Abhijit Mahajan <abhijit.mahajan@avagotech.com>
+L:      MPT-FusionLinux.pdl@avagotech.com
 L:      linux-scsi@vger.kernel.org
 W:      http://www.lsilogic.com/support
 S:      Supported
@@ -5490,15 +5568,15 @@ F:	Documentation/hwmon/ltc4261
 F:      drivers/hwmon/ltc4261.c
 
 LTP (Linux Test Project)
-M:      Shubham Goyal <shubham@linux.vnet.ibm.com>
 M:      Mike Frysinger <vapier@gentoo.org>
 M:      Cyril Hrubis <chrubis@suse.cz>
-M:      Caspar Zhang <caspar@casparzhang.com>
 M:      Wanlong Gao <gaowanlong@cn.fujitsu.com>
+M:      Jan Stancek <jstancek@redhat.com>
+M:      Stanislav Kholmanskikh <stanislav.kholmanskikh@oracle.com>
+M:      Alexey Kodanev <alexey.kodanev@oracle.com>
 L:      ltp-list@lists.sourceforge.net (subscribers-only)
-W:      http://ltp.sourceforge.net/
+W:      http://linux-test-project.github.io/
 T:      git git://github.com/linux-test-project/ltp.git
-T:      git git://ltp.git.sourceforge.net/gitroot/ltp/ltp-dev
 S:      Maintained
 
 M32R ARCHITECTURE
@@ -5742,17 +5820,6 @@ F:	include/linux/memory_hotplug.h
 F:      include/linux/vmalloc.h
 F:      mm/
 
-MEMORY RESOURCE CONTROLLER
-M:      Johannes Weiner <hannes@cmpxchg.org>
-M:      Michal Hocko <mhocko@suse.cz>
-M:      Balbir Singh <bsingharora@gmail.com>
-M:      KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
-L:      cgroups@vger.kernel.org
-L:      linux-mm@kvack.org
-S:      Maintained
-F:      mm/memcontrol.c
-F:      mm/page_cgroup.c
-
 MEMORY TECHNOLOGY DEVICES (MTD)
 M:      David Woodhouse <dwmw2@infradead.org>
 M:      Brian Norris <computersforpeace@gmail.com>
@@ -5946,6 +6013,7 @@ 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/
 F:      include/linux/mmc/
@@ -6007,6 +6075,28 @@ M:	Petr Vandrovec <petr@vandrovec.name>
 S:      Odd Fixes
 F:      fs/ncpfs/
 
+NCR 5380 SCSI DRIVERS
+M:      Finn Thain <fthain@telegraphics.com.au>
+M:      Michael Schmitz <schmitzmic@gmail.com>
+L:      linux-scsi@vger.kernel.org
+S:      Maintained
+F:      Documentation/scsi/g_NCR5380.txt
+F:      drivers/scsi/NCR5380.*
+F:      drivers/scsi/arm/cumana_1.c
+F:      drivers/scsi/arm/oak.c
+F:      drivers/scsi/atari_NCR5380.c
+F:      drivers/scsi/atari_scsi.*
+F:      drivers/scsi/dmx3191d.c
+F:      drivers/scsi/dtc.*
+F:      drivers/scsi/g_NCR5380.*
+F:      drivers/scsi/g_NCR5380_mmio.c
+F:      drivers/scsi/mac_scsi.*
+F:      drivers/scsi/pas16.*
+F:      drivers/scsi/sun3_NCR5380.c
+F:      drivers/scsi/sun3_scsi.*
+F:      drivers/scsi/sun3_scsi_vme.c
+F:      drivers/scsi/t128.*
+
 NCR DUAL 700 SCSI DRIVER (MICROCHANNEL)
 M:      "James E.J. Bottomley" <James.Bottomley@HansenPartnership.com>
 L:      linux-scsi@vger.kernel.org
@@ -6041,12 +6131,11 @@ F:	Documentation/networking/s2io.txt
 F:      Documentation/networking/vxge.txt
 F:      drivers/net/ethernet/neterion/
 
-NETFILTER/IPTABLES
+NETFILTER ({IP,IP6,ARP,EB,NF}TABLES)
 M:      Pablo Neira Ayuso <pablo@netfilter.org>
 M:      Patrick McHardy <kaber@trash.net>
 M:      Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
 L:      netfilter-devel@vger.kernel.org
-L:      netfilter@vger.kernel.org
 L:      coreteam@netfilter.org
 W:      http://www.netfilter.org/
 W:      http://www.iptables.org/
@@ -6116,6 +6205,7 @@ F:	include/uapi/linux/netdevice.h
 F:      tools/net/
 F:      tools/testing/selftests/net/
 F:      lib/random32.c
+F:      lib/test_bpf.c
 
 NETWORKING [IPv4/IPv6]
 M:      "David S. Miller" <davem@davemloft.net>
@@ -6415,6 +6505,7 @@ F:	drivers/usb/*/*omap*
 F:      arch/arm/*omap*/usb*
 
 OMAP GPIO DRIVER
+M:      Javier Martinez Canillas <javier@dowhile0.org>
 M:      Santosh Shilimkar <santosh.shilimkar@ti.com>
 M:      Kevin Hilman <khilman@deeprootsystems.com>
 L:      linux-omap@vger.kernel.org
@@ -6511,10 +6602,10 @@ T:	git git://openrisc.net/~jonas/linux
 F:      arch/openrisc/
 
 OPENVSWITCH
-M:      Jesse Gross <jesse@nicira.com>
+M:      Pravin Shelar <pshelar@nicira.com>
 L:      dev@openvswitch.org
 W:      http://openvswitch.org
-T:      git git://git.kernel.org/pub/scm/linux/kernel/git/jesse/openvswitch.git
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/pshelar/openvswitch.git
 S:      Maintained
 F:      net/openvswitch/
 
@@ -6704,10 +6795,11 @@ F:	Documentation/PCI/
 F:      drivers/pci/
 F:      include/linux/pci*
 F:      arch/x86/pci/
+F:      arch/x86/kernel/quirks.c
 
 PCI DRIVER FOR IMX6
 M:      Richard Zhu <r65037@freescale.com>
-M:      Shawn Guo <shawn.guo@linaro.org>
+M:      Shawn Guo <shawn.guo@freescale.com>
 L:      linux-pci@vger.kernel.org
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:      Maintained
@@ -6751,6 +6843,14 @@ L:	linux-pci@vger.kernel.org
 S:      Maintained
 F:      drivers/pci/host/*designware*
 
+PCI DRIVER FOR GENERIC OF HOSTS
+M:      Will Deacon <will.deacon@arm.com>
+L:      linux-pci@vger.kernel.org
+L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+S:      Maintained
+F:      Documentation/devicetree/bindings/pci/host-generic-pci.txt
+F:      drivers/pci/host/pci-host-generic.c
+
 PCMCIA SUBSYSTEM
 P:      Linux PCMCIA Team
 L:      linux-pcmcia@lists.infradead.org
@@ -6885,7 +6985,7 @@ PKUNITY SOC DRIVERS
 M:      Guan Xuetao <gxt@mprc.pku.edu.cn>
 W:      http://mprc.pku.edu.cn/~guanxuetao/linux
 S:      Maintained
-T:      git git://git.kernel.org/pub/scm/linux/kernel/git/epip/linux-2.6-unicore32.git
+T:      git git://github.com/gxt/linux.git
 F:      drivers/input/serio/i8042-unicore32io.h
 F:      drivers/i2c/busses/i2c-puv3.c
 F:      drivers/video/fb-puv3.c
@@ -6935,7 +7035,6 @@ F:	drivers/power/
 
 PNP SUPPORT
 M:      Rafael J. Wysocki <rafael.j.wysocki@intel.com>
-M:      Bjorn Helgaas <bhelgaas@google.com>
 S:      Maintained
 F:      drivers/pnp/
 
@@ -7402,6 +7501,14 @@ F:	drivers/rpmsg/
 F:      Documentation/rpmsg.txt
 F:      include/linux/rpmsg.h
 
+RESET CONTROLLER FRAMEWORK
+M:      Philipp Zabel <p.zabel@pengutronix.de>
+S:      Maintained
+F:      drivers/reset/
+F:      Documentation/devicetree/bindings/reset/
+F:      include/linux/reset.h
+F:      include/linux/reset-controller.h
+
 RFKILL
 M:      Johannes Berg <johannes@sipsolutions.net>
 L:      linux-wireless@vger.kernel.org
@@ -7651,7 +7758,6 @@ L:	linux-media@vger.kernel.org
 Q:      https://patchwork.linuxtv.org/project/linux-media/list/
 S:      Supported
 F:      drivers/media/platform/exynos4-is/
-F:      include/media/s5p_fimc.h
 
 SAMSUNG S3C24XX/S3C64XX SOC SERIES CAMIF DRIVER
 M:      Sylwester Nawrocki <sylvester.nawrocki@gmail.com>
@@ -7867,6 +7973,7 @@ F:	drivers/mmc/host/sdhci-spear.c
 
 SECURITY SUBSYSTEM
 M:      James Morris <james.l.morris@oracle.com>
+M:      Serge E. Hallyn <serge@hallyn.com>
 L:      linux-security-module@vger.kernel.org (suggested Cc:)
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git
 W:      http://kernsec.org/
@@ -7954,6 +8061,26 @@ M:	Robin Holt <robinmholt@gmail.com>
 S:      Maintained
 F:      drivers/misc/sgi-xp/
 
+SI2157 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/si2157*
+
+SI2168 MEDIA DRIVER
+M:      Antti Palosaari <crope@iki.fi>
+L:      linux-media@vger.kernel.org
+W:      http://linuxtv.org/
+W:      http://palosaari.fi/linux/
+Q:      http://patchwork.linuxtv.org/project/linux-media/list/
+T:      git git://linuxtv.org/anttip/media_tree.git
+S:      Maintained
+F:      drivers/media/dvb-frontends/si2168*
+
 SI470X FM RADIO RECEIVER I2C DRIVER
 M:      Hans Verkuil <hverkuil@xs4all.nl>
 L:      linux-media@vger.kernel.org
@@ -8094,13 +8221,15 @@ S:	Maintained
 F:      drivers/usb/misc/sisusbvga/
 
 SLAB ALLOCATOR
-M:      Christoph Lameter <cl@linux-foundation.org>
+M:      Christoph Lameter <cl@linux.com>
 M:      Pekka Enberg <penberg@kernel.org>
-M:      Matt Mackall <mpm@selenic.com>
+M:      David Rientjes <rientjes@google.com>
+M:      Joonsoo Kim <iamjoonsoo.kim@lge.com>
+M:      Andrew Morton <akpm@linux-foundation.org>
 L:      linux-mm@kvack.org
 S:      Maintained
 F:      include/linux/sl?b*.h
-F:      mm/sl?b.c
+F:      mm/sl?b*
 
 SLEEPABLE READ-COPY UPDATE (SRCU)
 M:      Lai Jiangshan <laijs@cn.fujitsu.com>
@@ -8253,6 +8382,7 @@ L:	alsa-devel@alsa-project.org (moderated for non-subscribers)
 W:      http://www.alsa-project.org/
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git
 T:      git git://git.alsa-project.org/alsa-kernel.git
+Q:      http://patchwork.kernel.org/project/alsa-devel/list/
 S:      Maintained
 F:      Documentation/sound/
 F:      include/sound/
@@ -8473,7 +8603,7 @@ S:	Maintained
 F:      drivers/staging/olpc_dcon/
 
 STAGING - OZMO DEVICES USB OVER WIFI DRIVER
-M:      Rupesh Gujare <rupesh.gujare@atmel.com>
+M:      Shigekatsu Tateno <shigekatsu.tateno@atmel.com>
 S:      Maintained
 F:      drivers/staging/ozwpan/
 
@@ -8488,6 +8618,13 @@ M:	Florian Schilhabel <florian.c.schilhabel@googlemail.com>.
 S:      Odd Fixes
 F:      drivers/staging/rtl8712/
 
+STAGING - REALTEK RTL8723U WIRELESS DRIVER
+M:      Larry Finger <Larry.Finger@lwfinger.net>
+M:      Jes Sorensen <Jes.Sorensen@redhat.com>
+L:      linux-wireless@vger.kernel.org
+S:      Maintained
+F:      drivers/staging/rtl8723au/
+
 STAGING - SILICON MOTION SM7XX FRAME BUFFER DRIVER
 M:      Teddy Wang <teddy.wang@siliconmotion.com.cn>
 S:      Odd Fixes
@@ -8859,7 +8996,7 @@ F:	drivers/media/radio/radio-raremono.c
 
 THERMAL
 M:      Zhang Rui <rui.zhang@intel.com>
-M:      Eduardo Valentin <eduardo.valentin@ti.com>
+M:      Eduardo Valentin <edubezval@gmail.com>
 L:      linux-pm@vger.kernel.org
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux.git
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal.git
@@ -8886,7 +9023,7 @@ S:	Maintained
 F:      drivers/platform/x86/thinkpad_acpi.c
 
 TI BANDGAP AND THERMAL DRIVER
-M:      Eduardo Valentin <eduardo.valentin@ti.com>
+M:      Eduardo Valentin <edubezval@gmail.com>
 L:      linux-pm@vger.kernel.org
 S:      Supported
 F:      drivers/thermal/ti-soc-thermal/
@@ -9009,7 +9146,7 @@ F:	include/linux/toshiba.h
 F:      include/uapi/linux/toshiba.h
 
 TMIO MMC DRIVER
-M:      Ian Molton <ian@mnementh.co.uk>
+M:      Ian Molton <ian.molton@codethink.co.uk>
 L:      linux-mmc@vger.kernel.org
 S:      Maintained
 F:      drivers/mmc/host/tmio_mmc*
@@ -9050,7 +9187,6 @@ F:	drivers/char/tpm/
 
 TRACING
 M:      Steven Rostedt <rostedt@goodmis.org>
-M:      Frederic Weisbecker <fweisbec@gmail.com>
 M:      Ingo Molnar <mingo@redhat.com>
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git perf/core
 S:      Maintained
@@ -9107,6 +9243,9 @@ F:	arch/um/os-Linux/drivers/
 
 TURBOCHANNEL SUBSYSTEM
 M:      "Maciej W. Rozycki" <macro@linux-mips.org>
+M:      Ralf Baechle <ralf@linux-mips.org>
+L:      linux-mips@linux-mips.org
+Q:      http://patchwork.linux-mips.org/project/linux-mips/list/
 S:      Maintained
 F:      drivers/tc/
 F:      include/linux/tc.h
@@ -9165,7 +9304,7 @@ UNICORE32 ARCHITECTURE:
 M:      Guan Xuetao <gxt@mprc.pku.edu.cn>
 W:      http://mprc.pku.edu.cn/~guanxuetao/linux
 S:      Maintained
-T:      git git://git.kernel.org/pub/scm/linux/kernel/git/epip/linux-2.6-unicore32.git
+T:      git git://github.com/gxt/linux.git
 F:      arch/unicore32/
 
 UNIFDEF
@@ -9298,12 +9437,6 @@ S:	Maintained
 F:      drivers/usb/host/isp116x*
 F:      include/linux/usb/isp116x.h
 
-USB KAWASAKI LSI DRIVER
-M:      Oliver Neukum <oliver@neukum.org>
-L:      linux-usb@vger.kernel.org
-S:      Maintained
-F:      drivers/usb/serial/kl5kusb105.*
-
 USB MASS STORAGE DRIVER
 M:      Matthew Dharm <mdharm-usb@one-eyed-alien.net>
 L:      linux-usb@vger.kernel.org
@@ -9331,12 +9464,6 @@ S:	Maintained
 F:      Documentation/usb/ohci.txt
 F:      drivers/usb/host/ohci*
 
-USB OPTION-CARD DRIVER
-M:      Matthias Urlichs <smurf@smurf.noris.de>
-L:      linux-usb@vger.kernel.org
-S:      Maintained
-F:      drivers/usb/serial/option.c
-
 USB PEGASUS DRIVER
 M:      Petko Manolov <petkan@nucleusys.com>
 L:      linux-usb@vger.kernel.org
@@ -9369,7 +9496,7 @@ S:	Maintained
 F:      drivers/net/usb/rtl8150.c
 
 USB SERIAL SUBSYSTEM
-M:      Johan Hovold <jhovold@gmail.com>
+M:      Johan Hovold <johan@kernel.org>
 L:      linux-usb@vger.kernel.org
 S:      Maintained
 F:      Documentation/usb/usb-serial.txt
@@ -9632,6 +9759,14 @@ L:	virtualization@lists.linux-foundation.org
 S:      Supported
 F:      arch/x86/kernel/cpu/vmware.c
 
+VMWARE BALLOON DRIVER
+M:      Xavier Deguillard <xdeguillard@vmware.com>
+M:      Philip Moltmann <moltmann@vmware.com>
+M:      "VMware, Inc." <pv-drivers@vmware.com>
+L:      linux-kernel@vger.kernel.org
+S:      Maintained
+F:      drivers/misc/vmw_balloon.c
+
 VMWARE VMXNET3 ETHERNET DRIVER
 M:      Shreyas Bhatewara <sbhatewara@vmware.com>
 M:      "VMware, Inc." <pv-drivers@vmware.com>