1 files changed, 89 insertions, 38 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 3d38291a402f..42c2264a154c 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -572,7 +572,7 @@ F:	drivers/net/appletalk/
 F:      net/appletalk/
 
 ARASAN COMPACT FLASH PATA CONTROLLER
-M:     Viresh Kumar <viresh.linux@gmail.com>
+M:      Viresh Kumar <viresh.linux@gmail.com>
 L:      linux-ide@vger.kernel.org
 S:      Maintained
 F:      include/linux/pata_arasan_cf_data.h
@@ -595,7 +595,6 @@ M:	Will Deacon <will.deacon@arm.com>
 S:      Maintained
 F:      arch/arm/kernel/perf_event*
 F:      arch/arm/oprofile/common.c
-F:      arch/arm/kernel/pmu.c
 F:      arch/arm/include/asm/pmu.h
 F:      arch/arm/kernel/hw_breakpoint.c
 F:      arch/arm/include/asm/hw_breakpoint.h
@@ -658,22 +657,6 @@ W:	http://www.linux4sam.org
 S:      Supported
 F:      arch/arm/mach-at91/
 
-ARM/BCMRING ARM ARCHITECTURE
-M:      Jiandong Zheng <jdzheng@broadcom.com>
-M:      Scott Branden <sbranden@broadcom.com>
-L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
-S:      Maintained
-F:      arch/arm/mach-bcmring
-
-ARM/BCMRING MTD NAND DRIVER
-M:      Jiandong Zheng <jdzheng@broadcom.com>
-M:      Scott Branden <sbranden@broadcom.com>
-L:      linux-mtd@lists.infradead.org
-S:      Maintained
-F:      drivers/mtd/nand/bcm_umi_nand.c
-F:      drivers/mtd/nand/bcm_umi_bch.c
-F:      drivers/mtd/nand/nand_bcm_umi.h
-
 ARM/CALXEDA HIGHBANK ARCHITECTURE
 M:      Rob Herring <rob.herring@calxeda.com>
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@ -777,6 +760,7 @@ S:	Maintained
 T:      git git://git.pengutronix.de/git/imx/linux-2.6.git
 F:      arch/arm/mach-imx/
 F:      arch/arm/plat-mxc/
+F:      arch/arm/configs/imx*_defconfig
 
 ARM/FREESCALE IMX6
 M:      Shawn Guo <shawn.guo@linaro.org>
@@ -913,6 +897,12 @@ W:	http://www.digriz.org.uk/ts78xx/kernel
 S:      Maintained
 F:      arch/arm/mach-orion5x/ts78xx-*
 
+ARM/MICREL KS8695 ARCHITECTURE
+M:      Greg Ungerer <gerg@uclinux.org>
+L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+F:      arch/arm/mach-ks8695
+S:      Odd Fixes
+
 ARM/MIOA701 MACHINE SUPPORT
 M:      Robert Jarzmik <robert.jarzmik@free.fr>
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@ -1209,6 +1199,12 @@ S:	Maintained
 F:      arch/arm/mach-pxa/z2.c
 F:      arch/arm/mach-pxa/include/mach/z2.h
 
+ARM64 PORT (AARCH64 ARCHITECTURE)
+M:      Catalin Marinas <catalin.marinas@arm.com>
+L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+S:      Maintained
+F:      arch/arm64/
+
 ASC7621 HARDWARE MONITOR DRIVER
 M:      George Joseph <george.joseph@fairview5.com>
 L:      lm-sensors@lm-sensors.org
@@ -1250,7 +1246,7 @@ F:	include/linux/i2c/at24.h
 
 ATA OVER ETHERNET (AOE) DRIVER
 M:      "Ed L. Cashin" <ecashin@coraid.com>
-W:      http://www.coraid.com/support/linux
+W:      http://support.coraid.com/support/linux
 S:      Supported
 F:      Documentation/aoe/
 F:      drivers/block/aoe/
@@ -1613,6 +1609,16 @@ L:	netdev@vger.kernel.org
 S:      Supported
 F:      drivers/net/ethernet/broadcom/bnx2x/
 
+BROADCOM BCM2835 ARM ARCHICTURE
+M:      Stephen Warren <swarren@wwwdotorg.org>
+L:      linux-rpi-kernel@lists.infradead.org (moderated for non-subscribers)
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-rpi.git
+S:      Maintained
+F:      arch/arm/mach-bcm2835/
+F:      arch/arm/boot/dts/bcm2835*
+F:      arch/arm/configs/bcm2835_defconfig
+F:      drivers/*/*bcm2835*
+
 BROADCOM TG3 GIGABIT ETHERNET DRIVER
 M:      Matt Carlson <mcarlson@broadcom.com>
 M:      Michael Chan <mchan@broadcom.com>
@@ -1645,7 +1651,6 @@ F:	drivers/bcma/
 F:      include/linux/bcma/
 
 BROCADE BFA FC SCSI DRIVER
-M:      Jing Huang <huangj@brocade.com>
 M:      Krishna C Gudipati <kgudipat@brocade.com>
 L:      linux-scsi@vger.kernel.org
 S:      Supported
@@ -2627,6 +2632,18 @@ T:	git git://git.alsa-project.org/alsa-kernel.git
 S:      Maintained
 F:      sound/usb/misc/ua101.c
 
+EXTENSIBLE FIRMWARE INTERFACE (EFI)
+M:      Matt Fleming <matt.fleming@intel.com>
+L:      linux-efi@vger.kernel.org
+S:      Maintained
+F:      Documentation/x86/efi-stub.txt
+F:      arch/ia64/kernel/efi.c
+F:      arch/x86/boot/compressed/eboot.[ch]
+F:      arch/x86/include/asm/efi.h
+F:      arch/x86/platform/efi/*
+F:      drivers/firmware/efivars.c
+F:      include/linux/efi*.h
+
 EFIFB FRAMEBUFFER DRIVER
 L:      linux-fbdev@vger.kernel.org
 M:      Peter Jones <pjones@redhat.com>
@@ -2859,7 +2876,9 @@ F:	include/linux/firewire*.h
 F:      tools/firewire/
 
 FIRMWARE LOADER (request_firmware)
-S:      Orphan
+M:      Ming Lei <ming.lei@canonical.com>
+L:      linux-kernel@vger.kernel.org
+S:      Maintained
 F:      Documentation/firmware_class/
 F:      drivers/base/firmware*.c
 F:      include/linux/firmware.h
@@ -3105,6 +3124,7 @@ T:	git git://git.secretlab.ca/git/linux-2.6.git
 F:      Documentation/gpio.txt
 F:      drivers/gpio/
 F:      include/linux/gpio*
+F:      include/asm-generic/gpio.h
 
 GRE DEMULTIPLEXER DRIVER
 M:      Dmitry Kozlov <xeb@mail.ru>
@@ -3388,7 +3408,7 @@ M:	"Wolfram Sang (embedded platforms)" <w.sang@pengutronix.de>
 L:      linux-i2c@vger.kernel.org
 W:      http://i2c.wiki.kernel.org/
 T:      quilt kernel.org/pub/linux/kernel/people/jdelvare/linux-2.6/jdelvare-i2c/
-T:      git git://git.fluff.org/bjdooks/linux.git
+T:      git git://git.pengutronix.de/git/wsa/linux.git
 S:      Maintained
 F:      Documentation/i2c/
 F:      drivers/i2c/
@@ -3420,6 +3440,18 @@ T:	git git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux.git
 S:      Maintained
 F:      arch/ia64/
 
+IBM Power in-Nest Crypto Acceleration
+M:      Kent Yoder <key@linux.vnet.ibm.com>
+L:      linux-crypto@vger.kernel.org
+S:      Supported
+F:      drivers/crypto/nx/
+
+IBM Power 842 compression accelerator
+M:      Robert Jennings <rcj@linux.vnet.ibm.com>
+S:      Supported
+F:      drivers/crypto/nx/nx-842.c
+F:      include/linux/nx842.h
+
 IBM Power Linux RAID adapter
 M:      Brian King <brking@us.ibm.com>
 S:      Supported
@@ -3431,6 +3463,13 @@ L:	netdev@vger.kernel.org
 S:      Supported
 F:      drivers/net/ethernet/ibm/ibmveth.*
 
+IBM Power Virtual SCSI/FC Device Drivers
+M:      Robert Jennings <rcj@linux.vnet.ibm.com>
+L:      linux-scsi@vger.kernel.org
+S:      Supported
+F:      drivers/scsi/ibmvscsi/
+X:      drivers/scsi/ibmvscsi/ibmvstgt.c
+
 IBM ServeRAID RAID DRIVER
 P:      Jack Hammer
 M:      Dave Jeffery <ipslinux@adaptec.com>
@@ -3552,11 +3591,12 @@ K:	\b(ABS|SYN)_MT_
 
 INTEL C600 SERIES SAS CONTROLLER DRIVER
 M:      Intel SCU Linux support <intel-linux-scu@intel.com>
+M:      Lukasz Dorau <lukasz.dorau@intel.com>
+M:      Maciej Patelczyk <maciej.patelczyk@intel.com>
 M:      Dave Jiang <dave.jiang@intel.com>
-M:      Ed Nadolski <edmund.nadolski@intel.com>
 L:      linux-scsi@vger.kernel.org
-T:      git git://git.kernel.org/pub/scm/linux/kernel/git/djbw/isci.git
-S:      Maintained
+T:      git git://git.code.sf.net/p/intel-sas/isci
+S:      Supported
 F:      drivers/scsi/isci/
 F:      firmware/isci/
 
@@ -3666,11 +3706,12 @@ F:	Documentation/networking/README.ipw2200
 F:      drivers/net/wireless/ipw2x00/
 
 INTEL(R) TRUSTED EXECUTION TECHNOLOGY (TXT)
-M:      Joseph Cihula <joseph.cihula@intel.com>
+M:      Richard L Maliszewski <richard.l.maliszewski@intel.com>
+M:      Gang Wei <gang.wei@intel.com>
 M:      Shane Wang <shane.wang@intel.com>
 L:      tboot-devel@lists.sourceforge.net
 W:      http://tboot.sourceforge.net
-T:      Mercurial http://www.bughost.org/repos.hg/tboot.hg
+T:      hg http://tboot.hg.sourceforge.net:8000/hgroot/tboot/tboot
 S:      Supported
 F:      Documentation/intel_txt.txt
 F:      include/linux/tboot.h
@@ -4797,6 +4838,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)
 S:      Maintained
 F:      net/nfc/
 F:      include/linux/nfc.h
@@ -5039,6 +5081,7 @@ S:	Maintained
 F:      Documentation/devicetree
 F:      drivers/of
 F:      include/linux/of*.h
+F:      scripts/dtc
 K:      of_get_property
 K:      of_match_table
 
@@ -5224,7 +5267,7 @@ F:	include/linux/i2c-algo-pca.h
 F:      include/linux/i2c-pca-platform.h
 
 PCDP - PRIMARY CONSOLE AND DEBUG PORT
-M:      Khalid Aziz <khalid.aziz@hp.com>
+M:      Khalid Aziz <khalid@gonehiking.org>
 S:      Maintained
 F:      drivers/firmware/pcdp.*
 
@@ -5320,6 +5363,12 @@ L:	linux-mtd@lists.infradead.org
 S:      Maintained
 F:      drivers/mtd/devices/phram.c
 
+PICOLCD HID DRIVER
+M:      Bruno Prémont <bonbons@linux-vserver.org>
+L:      linux-input@vger.kernel.org
+S:      Maintained
+F:      drivers/hid/hid-picolcd*
+
 PICOXCELL SUPPORT
 M:      Jamie Iles <jamie@jamieiles.com>
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@ -5507,7 +5556,7 @@ S:	Maintained
 W:      http://linuxptp.sourceforge.net/
 F:      Documentation/ABI/testing/sysfs-ptp
 F:      Documentation/ptp/*
-F:      drivers/net/gianfar_ptp.c
+F:      drivers/net/ethernet/freescale/gianfar_ptp.c
 F:      drivers/net/phy/dp83640*
 F:      drivers/ptp/*
 F:      include/linux/ptp_cl*
@@ -5543,6 +5592,8 @@ F:	Documentation/devicetree/bindings/pwm/
 F:      include/linux/pwm.h
 F:      include/linux/of_pwm.h
 F:      drivers/pwm/
+F:      drivers/video/backlight/pwm_bl.c
+F:      include/linux/pwm_backlight.h
 
 PXA2xx/PXA3xx SUPPORT
 M:      Eric Miao <eric.y.miao@gmail.com>
@@ -5937,7 +5988,7 @@ S:	Maintained
 F:      drivers/tty/serial
 
 SYNOPSYS DESIGNWARE DMAC DRIVER
-M:     Viresh Kumar <viresh.linux@gmail.com>
+M:      Viresh Kumar <viresh.linux@gmail.com>
 S:      Maintained
 F:      include/linux/dw_dmac.h
 F:      drivers/dma/dw_dmac_regs.h
@@ -6085,7 +6136,7 @@ S:	Maintained
 F:      drivers/mmc/host/sdhci-s3c.c
 
 SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) ST SPEAR DRIVER
-M:     Viresh Kumar <viresh.linux@gmail.com>
+M:      Viresh Kumar <viresh.linux@gmail.com>
 L:      spear-devel@list.st.com
 L:      linux-mmc@vger.kernel.org
 S:      Maintained
@@ -6450,7 +6501,7 @@ S:	Maintained
 F:      include/linux/compiler.h
 
 SPEAR PLATFORM SUPPORT
-M:     Viresh Kumar <viresh.linux@gmail.com>
+M:      Viresh Kumar <viresh.linux@gmail.com>
 M:      Shiraz Hashim <shiraz.hashim@st.com>
 L:      spear-devel@list.st.com
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@ -6459,7 +6510,7 @@ S:	Maintained
 F:      arch/arm/plat-spear/
 
 SPEAR13XX MACHINE SUPPORT
-M:     Viresh Kumar <viresh.linux@gmail.com>
+M:      Viresh Kumar <viresh.linux@gmail.com>
 M:      Shiraz Hashim <shiraz.hashim@st.com>
 L:      spear-devel@list.st.com
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@ -6468,7 +6519,7 @@ S:	Maintained
 F:      arch/arm/mach-spear13xx/
 
 SPEAR3XX MACHINE SUPPORT
-M:     Viresh Kumar <viresh.linux@gmail.com>
+M:      Viresh Kumar <viresh.linux@gmail.com>
 M:      Shiraz Hashim <shiraz.hashim@st.com>
 L:      spear-devel@list.st.com
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@ -6479,7 +6530,7 @@ F:	arch/arm/mach-spear3xx/
 SPEAR6XX MACHINE SUPPORT
 M:      Rajeev Kumar <rajeev-dlh.kumar@st.com>
 M:      Shiraz Hashim <shiraz.hashim@st.com>
-M:     Viresh Kumar <viresh.linux@gmail.com>
+M:      Viresh Kumar <viresh.linux@gmail.com>
 L:      spear-devel@list.st.com
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 W:      http://www.st.com/spear
@@ -6487,7 +6538,7 @@ S:	Maintained
 F:      arch/arm/mach-spear6xx/
 
 SPEAR CLOCK FRAMEWORK SUPPORT
-M:     Viresh Kumar <viresh.linux@gmail.com>
+M:      Viresh Kumar <viresh.linux@gmail.com>
 L:      spear-devel@list.st.com
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 W:      http://www.st.com/spear
@@ -6776,14 +6827,14 @@ F:	drivers/net/team/
 F:      include/linux/if_team.h
 
 TEGRA SUPPORT
-M:      Colin Cross <ccross@android.com>
-M:      Olof Johansson <olof@lixom.net>
 M:      Stephen Warren <swarren@wwwdotorg.org>
 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/swarren/linux-tegra.git
 S:      Supported
 F:      arch/arm/mach-tegra
+F:      arch/arm/boot/dts/tegra*
+F:      arch/arm/configs/tegra_defconfig
 
 TEHUTI ETHERNET DRIVER
 M:      Andy Gospodarek <andy@greyhouse.net>