diff options
| author | Olof Johansson <olof@lixom.net> | 2012-10-01 14:25:41 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-10-01 14:25:41 -0700 |
| commit | 5d3a0a95868a9669816da193bb284121df9031c8 (patch) | |
| tree | 292ce2c9135bd7b524b4710cff9a174c2967d600 /MAINTAINERS | |
| parent | 7e95c548818d2b311090848083277fb907cfb56d (diff) | |
| parent | b98138e00d96abc85b100c9b6886f105d9868ab5 (diff) | |
| download | linux-3.10-5d3a0a95868a9669816da193bb284121df9031c8.tar.gz linux-3.10-5d3a0a95868a9669816da193bb284121df9031c8.tar.bz2 linux-3.10-5d3a0a95868a9669816da193bb284121df9031c8.zip | |
Merge branch 'next/cleanup2' into HEAD
Conflicts:
arch/arm/Kconfig
arch/arm/Makefile
arch/arm/mach-bcmring/arch.c
arch/arm/mach-tegra/devices.c
arch/arm/mach-tegra/dma.c
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 140dba10dd4..8c22b7f6f41 100644 --- 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) |