diff options
author | Arnd Bergmann <arnd@arndb.de> | 2012-09-28 21:43:35 +0200 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2012-09-28 21:43:35 +0200 |
commit | 0b40b4b44378f18b3c76384fa1380c24b5cd0f52 (patch) | |
tree | 35aada569a65dba9c28423401fdb428bc1c7ec9a /MAINTAINERS | |
parent | 4369c5f3ae82009aa45115884208aada5a8c9273 (diff) | |
parent | 25e4b485fb8eeda8aa7a2e1e45fbb31538565117 (diff) |
Merge branch 'bcmring/removal' into next/cleanup2
From "Christian Daudt" <csd@broadcom.com>:
Remove mach-bcmring as this is no longer maintained or used.
Updated the removal with:
- drop the edit to mach-types requested by Russell King
- eliminate defconfig mod from patch 1 requested Olof Johansson
Also switched to using git send-email to avoid word-wrapping
problems
* bcmring/removal:
ARM: Remove mach-bcmring
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 53cc13c82cb..ee8feb80aac 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -658,22 +658,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) |