From: Russell King Date: Sat, 12 Sep 2009 11:01:34 +0000 (+0100) Subject: Merge branches 'arm', 'at91', 'bcmring', 'ep93xx', 'mach-types', 'misc' and 'w90x900... X-Git-Tag: v2.6.32-rc1~691^2~2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cf7a2b4fb6a9b86779930a0a123b0df41aa9208f;p=profile%2Fivi%2Fkernel-x86-ivi.git Merge branches 'arm', 'at91', 'bcmring', 'ep93xx', 'mach-types', 'misc' and 'w90x900' into devel --- cf7a2b4fb6a9b86779930a0a123b0df41aa9208f diff --cc MAINTAINERS index fa2a16d,fa2a16d,a67a998,7bf1128,fa2a16d,9d1601e,fa2a16d..7b91c6e --- a/MAINTAINERS +++ b/MAINTAINERS @@@@@@@@ -603,11 -603,11 -603,28 -603,15 -603,11 -603,11 -603,11 +603,32 @@@@@@@@ L: linux-arm-kernel@lists.arm.linux.org W: http://maxim.org.za/at91_26.html S: Maintained ++ ++++ARM/BCMRING ARM ARCHITECTURE ++ ++++P: Leo Chen ++ ++++P: Scott Branden ++ ++++L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only) ++ ++++S: Maintained ++ ++++F: arch/arm/mach-bcmring ++ ++++ ++ ++++ARM/BCMRING MTD NAND DRIVER ++ ++++P: Leo Chen ++ ++++P: Scott Branden ++ ++++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/bcm_umi_hamming.c ++ ++++F: drivers/mtd/nand/nand_bcm_umi.h ++ ++++ ARM/CIRRUS LOGIC EP93XX ARM ARCHITECTURE --- ---P: Lennert Buytenhek --- ---M: kernel@wantstofly.org +++ +++P: Hartley Sweeten +++ +++M: hsweeten@visionengravers.com +++ +++P: Ryan Mallon +++ +++M: ryan@bluewatersys.com L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only) S: Maintained +++ +++F: arch/arm/mach-ep93xx/ +++ +++F: arch/arm/mach-ep93xx/include/mach/ ARM/CIRRUS LOGIC EDB9315A MACHINE SUPPORT P: Lennert Buytenhek