1 files changed, 220 insertions, 105 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 94c9cffeb5d8..8774f7974d69 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -73,7 +73,8 @@ Descriptions of section entries:
         L: Mailing list that is relevant to this area
         W: Web-page with status/info
         Q: Patchwork web based patch tracking system site
-        T: SCM tree type and location.  Type is one of: git, hg, quilt, stgit, topgit.
+        T: SCM tree type and location.
+           Type is one of: git, hg, quilt, stgit, topgit
         S: Status, one of the following:
            Supported:   Someone is actually paid to look after this.
            Maintained:  Someone actually looks after it.
@@ -241,8 +242,8 @@ S:	Maintained
 F:      drivers/platform/x86/acer-wmi.c
 
 ACPI
-M:      Len Brown <lenb@kernel.org>
 M:      Rafael J. Wysocki <rjw@rjwysocki.net>
+M:      Len Brown <lenb@kernel.org>
 L:      linux-acpi@vger.kernel.org
 W:      https://01.org/linux-acpi
 Q:      https://patchwork.kernel.org/project/linux-acpi/list/
@@ -473,7 +474,7 @@ F:	net/rxrpc/af_rxrpc.c
 
 AGPGART DRIVER
 M:      David Airlie <airlied@linux.ie>
-T:      git git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6.git
+T:      git git://people.freedesktop.org/~airlied/linux (part of drm maint)
 S:      Maintained
 F:      drivers/char/agp/
 F:      include/linux/agp*
@@ -535,6 +536,13 @@ S:	Odd Fixes
 L:      linux-alpha@vger.kernel.org
 F:      arch/alpha/
 
+ALTERA TRIPLE SPEED ETHERNET DRIVER
+M:      Vince Bridgers <vbridgers2013@gmail.com
+L:      netdev@vger.kernel.org
+L:      nios2-dev@lists.rocketboards.org (moderated for non-subscribers)
+S:      Maintained
+F:      drivers/net/ethernet/altera/
+
 ALTERA UART/JTAG UART SERIAL DRIVERS
 M:      Tobias Klauser <tklauser@distanz.ch>
 L:      linux-serial@vger.kernel.org
@@ -910,11 +918,11 @@ F:	arch/arm/include/asm/hardware/dec21285.h
 F:      arch/arm/mach-footbridge/
 
 ARM/FREESCALE IMX / MXC ARM ARCHITECTURE
-M:      Shawn Guo <shawn.guo@linaro.org>
+M:      Shawn Guo <shawn.guo@freescale.com>
 M:      Sascha Hauer <kernel@pengutronix.de>
 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
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git
 F:      arch/arm/mach-imx/
 F:      arch/arm/boot/dts/imx*
 F:      arch/arm/configs/imx*_defconfig
@@ -1319,6 +1327,7 @@ M:	Linus Walleij <linus.walleij@linaro.org>
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:      Supported
 F:      arch/arm/mach-u300/
+F:      drivers/clocksource/timer-u300.c
 F:      drivers/i2c/busses/i2c-stu300.c
 F:      drivers/rtc/rtc-coh901331.c
 F:      drivers/watchdog/coh901327_wdt.c
@@ -1612,11 +1621,11 @@ S:	Maintained
 F:      drivers/net/wireless/atmel*
 
 ATTO EXPRESSSAS SAS/SATA RAID SCSI DRIVER
-M:      Bradley Grove <linuxdrivers@attotech.com>
-L:      linux-scsi@vger.kernel.org
-W:      http://www.attotech.com
-S:      Supported
-F:      drivers/scsi/esas2r
+M:      Bradley Grove <linuxdrivers@attotech.com>
+L:      linux-scsi@vger.kernel.org
+W:      http://www.attotech.com
+S:      Supported
+F:      drivers/scsi/esas2r
 
 AUDIT SUBSYSTEM
 M:      Eric Paris <eparis@redhat.com>
@@ -1695,6 +1704,8 @@ F:	drivers/net/wireless/b43legacy/
 
 BACKLIGHT CLASS/SUBSYSTEM
 M:      Jingoo Han <jg1.han@samsung.com>
+M:      Bryan Wu <cooloney@gmail.com>
+M:      Lee Jones <lee.jones@linaro.org>
 S:      Maintained
 F:      drivers/video/backlight/
 F:      include/linux/backlight.h
@@ -1737,6 +1748,7 @@ F:	include/uapi/linux/bfs_fs.h
 BLACKFIN ARCHITECTURE
 M:      Steven Miao <realmz6@gmail.com>
 L:      adi-buildroot-devel@lists.sourceforge.net
+T:      git git://git.code.sf.net/p/adi-linux/code
 W:      http://blackfin.uclinux.org
 S:      Supported
 F:      arch/blackfin/
@@ -1830,8 +1842,8 @@ F:	net/bluetooth/
 F:      include/net/bluetooth/
 
 BONDING DRIVER
-M:      Jay Vosburgh <fubar@us.ibm.com>
-M:      Veaceslav Falico <vfalico@redhat.com>
+M:      Jay Vosburgh <j.vosburgh@gmail.com>
+M:      Veaceslav Falico <vfalico@gmail.com>
 M:      Andy Gospodarek <andy@greyhouse.net>
 L:      netdev@vger.kernel.org
 W:      http://sourceforge.net/projects/bonding/
@@ -1845,6 +1857,12 @@ L:	netdev@vger.kernel.org
 S:      Supported
 F:      drivers/net/ethernet/broadcom/b44.*
 
+BROADCOM GENET ETHERNET DRIVER
+M:      Florian Fainelli <f.fainelli@gmail.com>
+L:      netdev@vger.kernel.org
+S:      Supported
+F:      drivers/net/ethernet/broadcom/genet/
+
 BROADCOM BNX2 GIGABIT ETHERNET DRIVER
 M:      Michael Chan <mchan@broadcom.com>
 L:      netdev@vger.kernel.org
@@ -1910,6 +1928,13 @@ L:	linux-scsi@vger.kernel.org
 S:      Supported
 F:      drivers/scsi/bnx2i/
 
+BROADCOM KONA GPIO DRIVER
+M:      Markus Mayer <markus.mayer@linaro.org>
+L:      bcm-kernel-feedback-list@broadcom.com
+S:      Supported
+F:      drivers/gpio/gpio-bcm-kona.c
+F:      Documentation/devicetree/bindings/gpio/gpio-bcm-kona.txt
+
 BROADCOM SPECIFIC AMBA DRIVER (BCMA)
 M:      Rafał Miłecki <zajec5@gmail.com>
 L:      linux-wireless@vger.kernel.org
@@ -1918,8 +1943,8 @@ F:	drivers/bcma/
 F:      include/linux/bcma/
 
 BROCADE BFA FC SCSI DRIVER
-M:      Anil Gurumurthy <agurumur@brocade.com>
-M:      Vijaya Mohan Guvva <vmohan@brocade.com>
+M:      Anil Gurumurthy <anil.gurumurthy@qlogic.com>
+M:      Sudarsana Kalluru <sudarsana.kalluru@qlogic.com>
 L:      linux-scsi@vger.kernel.org
 S:      Supported
 F:      drivers/scsi/bfa/
@@ -2159,7 +2184,7 @@ F:	Documentation/zh_CN/
 
 CHIPIDEA USB HIGH SPEED DUAL ROLE CONTROLLER
 M:      Peter Chen <Peter.Chen@freescale.com>
-T:      git://github.com/hzpeterchen/linux-usb.git
+T:      git git://github.com/hzpeterchen/linux-usb.git
 L:      linux-usb@vger.kernel.org
 S:      Maintained
 F:      drivers/usb/chipidea/
@@ -2179,9 +2204,9 @@ S:	Supported
 F:      drivers/net/ethernet/cisco/enic/
 
 CISCO VIC LOW LATENCY NIC DRIVER
-M:      Upinder Malhi <umalhi@cisco.com>
-S:      Supported
-F:      drivers/infiniband/hw/usnic
+M:      Upinder Malhi <umalhi@cisco.com>
+S:      Supported
+F:      drivers/infiniband/hw/usnic
 
 CIRRUS LOGIC EP93XX ETHERNET DRIVER
 M:      Hartley Sweeten <hsweeten@visionengravers.com>
@@ -2201,6 +2226,13 @@ 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>
+L:      alsa-devel@alsa-project.org (moderated for non-subscribers)
+S:      Maintained
+F:      sound/soc/codecs/cs*
+
 CLEANCACHE API
 M:      Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
 L:      linux-kernel@vger.kernel.org
@@ -2378,20 +2410,20 @@ F:	drivers/cpufreq/arm_big_little.c
 F:      drivers/cpufreq/arm_big_little_dt.c
 
 CPUIDLE DRIVER - ARM BIG LITTLE
-M:      Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
-M:      Daniel Lezcano <daniel.lezcano@linaro.org>
-L:      linux-pm@vger.kernel.org
-L:      linux-arm-kernel@lists.infradead.org
-T:      git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git
-S:      Maintained
-F:      drivers/cpuidle/cpuidle-big_little.c
+M:      Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
+M:      Daniel Lezcano <daniel.lezcano@linaro.org>
+L:      linux-pm@vger.kernel.org
+L:      linux-arm-kernel@lists.infradead.org
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git
+S:      Maintained
+F:      drivers/cpuidle/cpuidle-big_little.c
 
 CPUIDLE DRIVERS
 M:      Rafael J. Wysocki <rjw@rjwysocki.net>
 M:      Daniel Lezcano <daniel.lezcano@linaro.org>
 L:      linux-pm@vger.kernel.org
 S:      Maintained
-T:      git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git
 F:      drivers/cpuidle/*
 F:      include/linux/cpuidle.h
 
@@ -2458,9 +2490,9 @@ S:	Maintained
 F:      sound/pci/cs5535audio/
 
 CW1200 WLAN driver
-M:     Solomon Peachy <pizza@shaftnet.org>
-S:     Maintained
-F:     drivers/net/wireless/cw1200/
+M:      Solomon Peachy <pizza@shaftnet.org>
+S:      Maintained
+F:      drivers/net/wireless/cw1200/
 
 CX18 VIDEO4LINUX DRIVER
 M:      Andy Walls <awalls@md.metrocast.net>
@@ -2705,6 +2737,31 @@ F:	include/linux/device-mapper.h
 F:      include/linux/dm-*.h
 F:      include/uapi/linux/dm-*.h
 
+DIALOG SEMICONDUCTOR DRIVERS
+M:      Support Opensource <support.opensource@diasemi.com>
+W:      http://www.dialog-semiconductor.com/products
+S:      Supported
+F:      Documentation/hwmon/da90??
+F:      drivers/gpio/gpio-da90??.c
+F:      drivers/hwmon/da90??-hwmon.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/power/da9052-battery.c
+F:      drivers/regulator/da903x.c
+F:      drivers/regulator/da9???-regulator.[ch]
+F:      drivers/rtc/rtc-da90??.c
+F:      drivers/video/backlight/da90??_bl.c
+F:      drivers/watchdog/da90??_wdt.c
+F:      include/linux/mfd/da903x.h
+F:      include/linux/mfd/da9052/
+F:      include/linux/mfd/da9055/
+F:      include/linux/mfd/da9063/
+F:      include/sound/da[79]*.h
+F:      sound/soc/codecs/da[79]*.[ch]
+
 DIGI NEO AND CLASSIC PCI PRODUCTS
 M:      Lidza Louina <lidza.louina@gmail.com>
 L:      driverdev-devel@linuxdriverproject.org
@@ -2799,9 +2856,9 @@ S:	Supported
 F:      drivers/acpi/dock.c
 
 DOCUMENTATION
-M:      Rob Landley <rob@landley.net>
+M:      Randy Dunlap <rdunlap@infradead.org>
 L:      linux-doc@vger.kernel.org
-T:      TBD
+T:      quilt http://www.infradead.org/~rdunlap/Doc/patches/
 S:      Maintained
 F:      Documentation/
 
@@ -3095,6 +3152,8 @@ F:	fs/ecryptfs/
 
 EDAC-CORE
 M:      Doug Thompson <dougthompson@xmission.com>
+M:      Borislav Petkov <bp@alien8.de>
+M:      Mauro Carvalho Chehab <m.chehab@samsung.com>
 L:      linux-edac@vger.kernel.org
 W:      bluesmoke.sourceforge.net
 S:      Supported
@@ -3376,7 +3435,9 @@ F:	Documentation/filesystems/ext4.txt
 F:      fs/ext4/
 
 Extended Verification Module (EVM)
-M:      Mimi Zohar <zohar@us.ibm.com>
+M:      Mimi Zohar <zohar@linux.vnet.ibm.com>
+L:      linux-ima-devel@lists.sourceforge.net
+L:      linux-security-module@vger.kernel.org
 S:      Supported
 F:      security/integrity/evm/
 
@@ -3653,8 +3714,8 @@ S:	Maintained
 F:      fs/freevxfs/
 
 FREEZER
-M:      Pavel Machek <pavel@ucw.cz>
 M:      "Rafael J. Wysocki" <rjw@rjwysocki.net>
+M:      Pavel Machek <pavel@ucw.cz>
 L:      linux-pm@vger.kernel.org
 S:      Supported
 F:      Documentation/power/freezing-of-tasks.txt
@@ -4018,8 +4079,8 @@ S:	Maintained
 F:      drivers/video/hgafb.c
 
 HIBERNATION (aka Software Suspend, aka swsusp)
-M:      Pavel Machek <pavel@ucw.cz>
 M:      "Rafael J. Wysocki" <rjw@rjwysocki.net>
+M:      Pavel Machek <pavel@ucw.cz>
 L:      linux-pm@vger.kernel.org
 S:      Supported
 F:      arch/x86/power/
@@ -4101,8 +4162,7 @@ F:	include/linux/hpet.h
 F:      include/uapi/linux/hpet.h
 
 HPET:   x86
-M:      "Venkatesh Pallipadi (Venki)" <venki@google.com>
-S:      Maintained
+S:      Orphan
 F:      arch/x86/kernel/hpet.c
 F:      arch/x86/include/asm/hpet.h
 
@@ -4398,8 +4458,11 @@ S:	Maintained
 F:      drivers/ipack/
 
 INTEGRITY MEASUREMENT ARCHITECTURE (IMA)
-M:      Mimi Zohar <zohar@us.ibm.com>
+M:      Mimi Zohar <zohar@linux.vnet.ibm.com>
 M:      Dmitry Kasatkin <d.kasatkin@samsung.com>
+L:      linux-ima-devel@lists.sourceforge.net
+L:      linux-ima-user@lists.sourceforge.net
+L:      linux-security-module@vger.kernel.org
 S:      Supported
 F:      security/integrity/ima/
 
@@ -4541,6 +4604,7 @@ M:	Greg Rose <gregory.v.rose@intel.com>
 M:      Alex Duyck <alexander.h.duyck@intel.com>
 M:      John Ronciak <john.ronciak@intel.com>
 M:      Mitch Williams <mitch.a.williams@intel.com>
+M:      Linux NICS <linux.nics@intel.com>
 L:      e1000-devel@lists.sourceforge.net
 W:      http://www.intel.com/support/feedback.htm
 W:      http://e1000.sourceforge.net/
@@ -4558,6 +4622,7 @@ F:	Documentation/networking/ixgbevf.txt
 F:      Documentation/networking/i40e.txt
 F:      Documentation/networking/i40evf.txt
 F:      drivers/net/ethernet/intel/
+F:      drivers/net/ethernet/intel/*/
 
 INTEL-MID GPIO DRIVER
 M:      David Cohen <david.a.cohen@linux.intel.com>
@@ -4588,7 +4653,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
+L:     wimax@linuxwimax.org (subscribers-only)
 S:      Supported
 W:      http://linuxwimax.org
 F:      Documentation/wimax/README.i2400m
@@ -4898,7 +4963,7 @@ F:	drivers/staging/ktap/
 KCONFIG
 M:      "Yann E. MORIN" <yann.morin.1998@free.fr>
 L:      linux-kbuild@vger.kernel.org
-T:      git://gitorious.org/linux-kconfig/linux-kconfig
+T:      git git://gitorious.org/linux-kconfig/linux-kconfig
 S:      Maintained
 F:      Documentation/kbuild/kconfig-language.txt
 F:      scripts/kconfig/
@@ -5049,8 +5114,8 @@ F:	include/keys/
 F:      security/keys/
 
 KEYS-TRUSTED
-M:      David Safford <safford@watson.ibm.com>
-M:      Mimi Zohar <zohar@us.ibm.com>
+M:      David Safford <safford@us.ibm.com>
+M:      Mimi Zohar <zohar@linux.vnet.ibm.com>
 L:      linux-security-module@vger.kernel.org
 L:      keyrings@linux-nfs.org
 S:      Supported
@@ -5060,8 +5125,8 @@ F:	security/keys/trusted.c
 F:      security/keys/trusted.h
 
 KEYS-ENCRYPTED
-M:      Mimi Zohar <zohar@us.ibm.com>
-M:      David Safford <safford@watson.ibm.com>
+M:      Mimi Zohar <zohar@linux.vnet.ibm.com>
+M:      David Safford <safford@us.ibm.com>
 L:      linux-security-module@vger.kernel.org
 L:      keyrings@linux-nfs.org
 S:      Supported
@@ -5224,11 +5289,10 @@ F:	arch/powerpc/platforms/512x/
 F:      arch/powerpc/platforms/52xx/
 
 LINUX FOR POWERPC EMBEDDED PPC4XX
-M:      Josh Boyer <jwboyer@gmail.com>
+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
-T:      git git://git.kernel.org/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx.git
 S:      Maintained
 F:      arch/powerpc/platforms/40x/
 F:      arch/powerpc/platforms/44x/
@@ -5455,11 +5519,11 @@ 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
-T:      git git://linuxtv.org/media_tree.git
-S:      Maintained
-F:      drivers/media/radio/radio-ma901.c
+M:      Alexey Klimov <klimov.linux@gmail.com>
+L:      linux-media@vger.kernel.org
+T:      git git://linuxtv.org/media_tree.git
+S:      Maintained
+F:      drivers/media/radio/radio-ma901.c
 
 MAC80211
 M:      Johannes Berg <johannes@sipsolutions.net>
@@ -5620,7 +5684,7 @@ F:	drivers/scsi/megaraid/
 
 MELLANOX ETHERNET DRIVER (mlx4_en)
 M:      Amir Vadai <amirv@mellanox.com>
-L:      netdev@vger.kernel.org
+L:      netdev@vger.kernel.org
 S:      Supported
 W:      http://www.mellanox.com
 Q:      http://patchwork.ozlabs.org/project/netdev/list/
@@ -5661,11 +5725,17 @@ F:	include/linux/mtd/
 F:      include/uapi/mtd/
 
 MEN A21 WATCHDOG DRIVER
-M:      Johannes Thumshirn <johannes.thumshirn@men.de>
+M:      Johannes Thumshirn <johannes.thumshirn@men.de>
 L:      linux-watchdog@vger.kernel.org
 S:      Supported
 F:      drivers/watchdog/mena21_wdt.c
 
+MEN CHAMELEON BUS (mcb)
+M:      Johannes Thumshirn <johannes.thumshirn@men.de>
+S:      Supported
+F:      drivers/mcb/
+F:      include/linux/mcb.h
+
 METAG ARCHITECTURE
 M:      James Hogan <james.hogan@imgtec.com>
 L:      linux-metag@vger.kernel.org
@@ -5681,7 +5751,6 @@ F:	fs/imgdafs/
 
 MICROBLAZE ARCHITECTURE
 M:      Michal Simek <monstr@monstr.eu>
-L:      microblaze-uclinux@itee.uq.edu.au (moderated for non-subscribers)
 W:      http://www.monstr.eu/fdt/
 T:      git git://git.monstr.eu/linux-2.6-microblaze.git
 S:      Supported
@@ -5717,20 +5786,20 @@ L:	linux-rdma@vger.kernel.org
 W:      http://www.mellanox.com
 Q:      http://patchwork.ozlabs.org/project/netdev/list/
 Q:      http://patchwork.kernel.org/project/linux-rdma/list/
-T:      git://openfabrics.org/~eli/connect-ib.git
+T:      git git://openfabrics.org/~eli/connect-ib.git
 S:      Supported
 F:      drivers/net/ethernet/mellanox/mlx5/core/
 F:      include/linux/mlx5/
 
 Mellanox MLX5 IB driver
-M:      Eli Cohen <eli@mellanox.com>
-L:      linux-rdma@vger.kernel.org
-W:      http://www.mellanox.com
-Q:      http://patchwork.kernel.org/project/linux-rdma/list/
-T:      git://openfabrics.org/~eli/connect-ib.git
-S:      Supported
-F:      include/linux/mlx5/
-F:      drivers/infiniband/hw/mlx5/
+M:      Eli Cohen <eli@mellanox.com>
+L:      linux-rdma@vger.kernel.org
+W:      http://www.mellanox.com
+Q:      http://patchwork.kernel.org/project/linux-rdma/list/
+T:      git git://openfabrics.org/~eli/connect-ib.git
+S:      Supported
+F:      include/linux/mlx5/
+F:      drivers/infiniband/hw/mlx5/
 
 MODULE SUPPORT
 M:      Rusty Russell <rusty@rustcorp.com.au>
@@ -6002,6 +6071,9 @@ F:	include/linux/netdevice.h
 F:      include/uapi/linux/in.h
 F:      include/uapi/linux/net.h
 F:      include/uapi/linux/netdevice.h
+F:      tools/net/
+F:      tools/testing/selftests/net/
+F:      lib/random32.c
 
 NETWORKING [IPv4/IPv6]
 M:      "David S. Miller" <davem@davemloft.net>
@@ -6025,6 +6097,7 @@ L:	netdev@vger.kernel.org
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git
 S:      Maintained
+F:      net/core/flow.c
 F:      net/xfrm/
 F:      net/key/
 F:      net/ipv4/xfrm*
@@ -6100,6 +6173,7 @@ F:	include/net/nfc/
 F:      include/uapi/linux/nfc.h
 F:      drivers/nfc/
 F:      include/linux/platform_data/pn544.h
+F:      Documentation/devicetree/bindings/net/nfc/
 
 NFS, SUNRPC, AND LOCKD CLIENTS
 M:      Trond Myklebust <trond.myklebust@primarydata.com>
@@ -6118,10 +6192,10 @@ F:	include/uapi/linux/nfs*
 F:      include/uapi/linux/sunrpc/
 
 NILFS2 FILESYSTEM
-M:      KONISHI Ryusuke <konishi.ryusuke@lab.ntt.co.jp>
+M:      Ryusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>
 L:      linux-nilfs@vger.kernel.org
-W:      http://www.nilfs.org/en/
-T:      git git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2.git
+W:      http://nilfs.sourceforge.net/
+T:      git git://github.com/konis/nilfs2.git
 S:      Supported
 F:      Documentation/filesystems/nilfs2.txt
 F:      fs/nilfs2/
@@ -6175,6 +6249,12 @@ S:	Supported
 F:      drivers/block/nvme*
 F:      include/linux/nvme.h
 
+NXP TDA998X DRM DRIVER
+M:      Russell King <rmk+kernel@arm.linux.org.uk>
+S:      Supported
+F:      drivers/gpu/drm/i2c/tda998x_drv.c
+F:      include/drm/i2c/tda998x.h
+
 OMAP SUPPORT
 M:      Tony Lindgren <tony@atomide.com>
 L:      linux-omap@vger.kernel.org
@@ -7053,13 +7133,8 @@ F:	Documentation/networking/LICENSE.qla3xxx
 F:      drivers/net/ethernet/qlogic/qla3xxx.*
 
 QLOGIC QLCNIC (1/10)Gb ETHERNET DRIVER
-M:      Himanshu Madhani <himanshu.madhani@qlogic.com>
-M:      Rajesh Borundia <rajesh.borundia@qlogic.com>
 M:      Shahed Shaikh <shahed.shaikh@qlogic.com>
-M:      Jitendra Kalsaria <jitendra.kalsaria@qlogic.com>
-M:      Sony Chacko <sony.chacko@qlogic.com>
-M:      Sucheta Chakraborty <sucheta.chakraborty@qlogic.com>
-M:      linux-driver@qlogic.com
+M:      Dept-HSGLinuxNICDev@qlogic.com
 L:      netdev@vger.kernel.org
 S:      Supported
 F:      drivers/net/ethernet/qlogic/qlcnic/
@@ -7404,10 +7479,26 @@ W:	http://www.ibm.com/developerworks/linux/linux390/
 S:      Supported
 F:      arch/s390/
 F:      drivers/s390/
-F:      block/partitions/ibm.c
 F:      Documentation/s390/
 F:      Documentation/DocBook/s390*
 
+S390 COMMON I/O LAYER
+M:      Sebastian Ott <sebott@linux.vnet.ibm.com>
+M:      Peter Oberparleiter <oberpar@linux.vnet.ibm.com>
+L:      linux-s390@vger.kernel.org
+W:      http://www.ibm.com/developerworks/linux/linux390/
+S:      Supported
+F:      drivers/s390/cio/
+
+S390 DASD DRIVER
+M:      Stefan Weinhuber <wein@de.ibm.com>
+M:      Stefan Haberland <stefan.haberland@de.ibm.com>
+L:      linux-s390@vger.kernel.org
+W:      http://www.ibm.com/developerworks/linux/linux390/
+S:      Supported
+F:      drivers/s390/block/dasd*
+F:      block/partitions/ibm.c
+
 S390 NETWORK DRIVERS
 M:      Ursula Braun <ursula.braun@de.ibm.com>
 M:      Frank Blaschka <blaschka@linux.vnet.ibm.com>
@@ -7417,6 +7508,15 @@ W:	http://www.ibm.com/developerworks/linux/linux390/
 S:      Supported
 F:      drivers/s390/net/
 
+S390 PCI SUBSYSTEM
+M:      Sebastian Ott <sebott@linux.vnet.ibm.com>
+M:      Gerald Schaefer <gerald.schaefer@de.ibm.com>
+L:      linux-s390@vger.kernel.org
+W:      http://www.ibm.com/developerworks/linux/linux390/
+S:      Supported
+F:      arch/s390/pci/
+F:      drivers/pci/hotplug/s390_pci_hpc.c
+
 S390 ZCRYPT DRIVER
 M:      Ingo Tuchscherer <ingo.tuchscherer@de.ibm.com>
 M:      linux390@de.ibm.com
@@ -7540,6 +7640,15 @@ S:	Supported
 L:      linux-samsung-soc@vger.kernel.org (moderated for non-subscribers)
 F:      drivers/clk/samsung/
 
+SAMSUNG SXGBE DRIVERS
+M:      Byungho An <bh74.an@samsung.com>
+M:      Girish K S <ks.giri@samsung.com>
+M:      Siva Reddy Kallam <siva.kallam@samsung.com>
+M:      Vipul Pandya <vipul.pandya@samsung.com>
+S:      Supported
+L:      netdev@vger.kernel.org
+F:      drivers/net/ethernet/samsung/sxgbe/
+
 SERIAL DRIVERS
 M:      Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 L:      linux-serial@vger.kernel.org
@@ -7729,11 +7838,10 @@ M:	Security Officers <security@kernel.org>
 S:      Supported
 
 SELINUX SECURITY MODULE
+M:      Paul Moore <paul@paul-moore.com>
 M:      Stephen Smalley <sds@tycho.nsa.gov>
-M:      James Morris <james.l.morris@oracle.com>
 M:      Eric Paris <eparis@parisplace.org>
-M:      Paul Moore <paul@paul-moore.com>
-L:      selinux@tycho.nsa.gov (subscribers-only, general discussion)
+L:      selinux@tycho.nsa.gov (moderated for non-subscribers)
 W:      http://selinuxproject.org
 T:      git git://git.infradead.org/users/pcmoore/selinux
 S:      Supported
@@ -7800,13 +7908,6 @@ F:	Documentation/ia64/serial.txt
 F:      drivers/tty/serial/ioc?_serial.c
 F:      include/linux/ioc?.h
 
-SGI VISUAL WORKSTATION 320 AND 540
-M:      Andrey Panin <pazke@donpac.ru>
-L:      linux-visws-devel@lists.sf.net
-W:      http://linux-visws.sf.net
-S:      Maintained for 2.6.
-F:      Documentation/sgi-visws.txt
-
 SGI XP/XPC/XPNET DRIVER
 M:      Cliff Whickman <cpw@sgi.com>
 M:      Robin Holt <robinmholt@gmail.com>
@@ -8352,6 +8453,12 @@ M:	Teddy Wang <teddy.wang@siliconmotion.com.cn>
 S:      Odd Fixes
 F:      drivers/staging/sm7xxfb/
 
+STAGING - SLICOSS
+M:      Lior Dotan <liodot@gmail.com>
+M:      Christopher Harrer <charrer@alacritech.com>
+S:      Odd Fixes
+F:      drivers/staging/slicoss/
+
 STAGING - SOFTLOGIC 6x10 MPEG CODEC
 M:      Ismael Luceno <ismael.luceno@corp.bluecherry.net>
 S:      Supported
@@ -8413,20 +8520,18 @@ S:	Maintained
 F:      drivers/net/ethernet/dlink/sundance.c
 
 SUPERH
-M:      Paul Mundt <lethal@linux-sh.org>
 L:      linux-sh@vger.kernel.org
 W:      http://www.linux-sh.org
 Q:      http://patchwork.kernel.org/project/linux-sh/list/
-T:      git git://github.com/pmundt/linux-sh.git sh-latest
-S:      Supported
+S:      Orphan
 F:      Documentation/sh/
 F:      arch/sh/
 F:      drivers/sh/
 
 SUSPEND TO RAM
+M:      "Rafael J. Wysocki" <rjw@rjwysocki.net>
 M:      Len Brown <len.brown@intel.com>
 M:      Pavel Machek <pavel@ucw.cz>
-M:      "Rafael J. Wysocki" <rjw@rjwysocki.net>
 L:      linux-pm@vger.kernel.org
 S:      Supported
 F:      Documentation/power/
@@ -8702,6 +8807,7 @@ M:	Max Filippov <jcmvbkbc@gmail.com>
 L:      linux-xtensa@linux-xtensa.org
 S:      Maintained
 F:      arch/xtensa/
+F:      drivers/irqchip/irq-xtensa-*
 
 THANKO'S RAREMONO AM/FM/SW RADIO RECEIVER USB DRIVER
 M:      Hans Verkuil <hverkuil@xs4all.nl>
@@ -8712,17 +8818,17 @@ S:	Maintained
 F:      drivers/media/radio/radio-raremono.c
 
 THERMAL
-M:      Zhang Rui <rui.zhang@intel.com>
-M:      Eduardo Valentin <eduardo.valentin@ti.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
-Q:      https://patchwork.kernel.org/project/linux-pm/list/
-S:      Supported
-F:      drivers/thermal/
-F:      include/linux/thermal.h
-F:      include/linux/cpu_cooling.h
-F:      Documentation/devicetree/bindings/thermal/
+M:      Zhang Rui <rui.zhang@intel.com>
+M:      Eduardo Valentin <eduardo.valentin@ti.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
+Q:      https://patchwork.kernel.org/project/linux-pm/list/
+S:      Supported
+F:      drivers/thermal/
+F:      include/linux/thermal.h
+F:      include/linux/cpu_cooling.h
+F:      Documentation/devicetree/bindings/thermal/
 
 THINGM BLINK(1) USB RGB LED DRIVER
 M:      Vivien Didelot <vivien.didelot@savoirfairelinux.com>
@@ -9037,6 +9143,13 @@ F:	drivers/cdrom/cdrom.c
 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/
+
 UNIVERSAL FLASH STORAGE HOST CONTROLLER DRIVER
 M:      Vinayak Holikatti <vinholikatti@gmail.com>
 M:      Santosh Y <santoshsy@gmail.com>
@@ -9075,8 +9188,7 @@ S:	Maintained
 F:      drivers/net/wireless/ath/ar5523/
 
 USB ATTACHED SCSI
-M:      Matthew Wilcox <willy@linux.intel.com>
-M:      Sarah Sharp <sarah.a.sharp@linux.intel.com>
+M:      Hans de Goede <hdegoede@redhat.com>
 M:      Gerd Hoffmann <kraxel@redhat.com>
 L:      linux-usb@vger.kernel.org
 L:      linux-scsi@vger.kernel.org
@@ -9302,7 +9414,7 @@ S:	Maintained
 F:      drivers/net/wireless/rndis_wlan.c
 
 USB XHCI DRIVER
-M:      Sarah Sharp <sarah.a.sharp@linux.intel.com>
+M:      Mathias Nyman <mathias.nyman@intel.com>
 L:      linux-usb@vger.kernel.org
 S:      Supported
 F:      drivers/usb/host/xhci*
@@ -9386,7 +9498,6 @@ F:	include/media/videobuf2-*
 
 VIRTIO CONSOLE DRIVER
 M:      Amit Shah <amit.shah@redhat.com>
-L:      virtio-dev@lists.oasis-open.org
 L:      virtualization@lists.linux-foundation.org
 S:      Maintained
 F:      drivers/char/virtio_console.c
@@ -9396,7 +9507,6 @@ 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:      virtio-dev@lists.oasis-open.org
 L:      virtualization@lists.linux-foundation.org
 S:      Maintained
 F:      drivers/virtio/
@@ -9409,7 +9519,6 @@ F:	include/uapi/linux/virtio_*.h
 VIRTIO HOST (VHOST)
 M:      "Michael S. Tsirkin" <mst@redhat.com>
 L:      kvm@vger.kernel.org
-L:      virtio-dev@lists.oasis-open.org
 L:      virtualization@lists.linux-foundation.org
 L:      netdev@vger.kernel.org
 S:      Maintained
@@ -9590,7 +9699,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
+L:     wimax@linuxwimax.org (subscribers-only)
 S:      Supported
 W:      http://linuxwimax.org
 F:      Documentation/wimax/README.wimax
@@ -9780,6 +9889,12 @@ L:	linux-serial@vger.kernel.org
 S:      Maintained
 F:      drivers/tty/serial/uartlite.c
 
+XTENSA XTFPGA PLATFORM SUPPORT
+M:      Max Filippov <jcmvbkbc@gmail.com>
+L:      linux-xtensa@linux-xtensa.org
+S:      Maintained
+F:      drivers/spi/spi-xtensa-xtfpga.c
+
 YAM DRIVER FOR AX.25
 M:      Jean-Paul Roubelat <jpr@f6fbb.org>
 L:      linux-hams@vger.kernel.org
@@ -9824,7 +9939,7 @@ ZR36067 VIDEO FOR LINUX DRIVER
 L:      mjpeg-users@lists.sourceforge.net
 L:      linux-media@vger.kernel.org
 W:      http://mjpeg.sourceforge.net/driver-zoran/
-T:      Mercurial http://linuxtv.org/hg/v4l-dvb
+T:      hg http://linuxtv.org/hg/v4l-dvb
 S:      Odd Fixes
 F:      drivers/media/pci/zoran/