Merge tag 'jfs-3.7' of git://github.com/kleikamp/linux-shaggy

[linux-beck.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index a9f1ac20a0941d4cff4ce305b76aedbb1b8904c6..28167d0f8b4298d0f3a13508497866a4f0534200 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -657,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)
@@ -912,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 <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)
@@ -1618,6 +1608,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>
@@ -1650,7 +1650,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
@@ -2632,6 +2631,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>
@@ -3438,6 +3449,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>
@@ -4806,6 +4824,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
@@ -6793,14 +6812,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>