Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

[linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 53cc13c82cb1d74646c310e78d01a3509841a669..78336396a432e0a076a9cda21a60cc483c33497e 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -595,7 +595,6 @@ M:  Will Deacon <[email protected]>
 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 <[email protected]>
-M:     Scott Branden <[email protected]>
-L:     [email protected] (moderated for non-subscribers)
-S:     Maintained
-F:     arch/arm/mach-bcmring
-
-ARM/BCMRING MTD NAND DRIVER
-M:     Jiandong Zheng <[email protected]>
-M:     Scott Branden <[email protected]>
-L:     [email protected]
-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 <[email protected]>
 L:     [email protected] (moderated for non-subscribers)
@@ -913,6 +896,12 @@ W: http://www.digriz.org.uk/ts78xx/kernel
 S:     Maintained
 F:     arch/arm/mach-orion5x/ts78xx-*
 
+ARM/MICREL KS8695 ARCHITECTURE
+M:     Greg Ungerer <[email protected]>
+L:     [email protected] (moderated for non-subscribers)
+F:     arch/arm/mach-ks8695
+S:     Odd Fixes
+
 ARM/MIOA701 MACHINE SUPPORT
 M:     Robert Jarzmik <[email protected]>
 L:     [email protected] (moderated for non-subscribers)
@@ -1209,6 +1198,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 <[email protected]>
+L:     [email protected] (moderated for non-subscribers)
+S:     Maintained
+F:     arch/arm64/
+
 ASC7621 HARDWARE MONITOR DRIVER
 M:     George Joseph <[email protected]>
 L:     [email protected]
@@ -1613,6 +1608,16 @@ L:       [email protected]
 S:     Supported
 F:     drivers/net/ethernet/broadcom/bnx2x/
 
+BROADCOM BCM2835 ARM ARCHICTURE
+M:     Stephen Warren <[email protected]>
+L:     [email protected] (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 <[email protected]>
 M:     Michael Chan <[email protected]>
@@ -2859,7 +2864,9 @@ F:        include/linux/firewire*.h
 F:     tools/firewire/
 
 FIRMWARE LOADER (request_firmware)
-S:     Orphan
+M:     Ming Lei <[email protected]>
+L:     [email protected]
+S:     Maintained
 F:     Documentation/firmware_class/
 F:     drivers/base/firmware*.c
 F:     include/linux/firmware.h
@@ -3552,11 +3559,12 @@ K:      \b(ABS|SYN)_MT_
 
 INTEL C600 SERIES SAS CONTROLLER DRIVER
 M:     Intel SCU Linux support <[email protected]>
+M:     Lukasz Dorau <[email protected]>
+M:     Maciej Patelczyk <[email protected]>
 M:     Dave Jiang <[email protected]>
-M:     Ed Nadolski <[email protected]>
 L:     [email protected]
-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 +3674,12 @@ F:      Documentation/networking/README.ipw2200
 F:     drivers/net/wireless/ipw2x00/
 
 INTEL(R) TRUSTED EXECUTION TECHNOLOGY (TXT)
-M:     Joseph Cihula <[email protected]>
+M:     Richard L Maliszewski <[email protected]>
+M:     Gang Wei <[email protected]>
 M:     Shane Wang <[email protected]>
 L:     [email protected]
 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 +4806,7 @@ M:        Lauro Ramos Venancio <[email protected]>
 M:     Aloisio Almeida Jr <[email protected]>
 M:     Samuel Ortiz <[email protected]>
 L:     [email protected]
+L:     [email protected] (moderated for non-subscribers)
 S:     Maintained
 F:     net/nfc/
 F:     include/linux/nfc.h
@@ -5320,6 +5330,12 @@ L:       [email protected]
 S:     Maintained
 F:     drivers/mtd/devices/phram.c
 
+PICOLCD HID DRIVER
+M:     Bruno Prémont <[email protected]>
+L:     [email protected]
+S:     Maintained
+F:     drivers/hid/hid-picolcd*
+
 PICOXCELL SUPPORT
 M:     Jamie Iles <[email protected]>
 L:     [email protected] (moderated for non-subscribers)
@@ -5543,6 +5559,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 <[email protected]>
@@ -6776,14 +6794,14 @@ F:      drivers/net/team/
 F:     include/linux/if_team.h
 
 TEGRA SUPPORT
-M:     Colin Cross <[email protected]>
-M:     Olof Johansson <[email protected]>
 M:     Stephen Warren <[email protected]>
 L:     [email protected]
 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 <[email protected]>