Merge branches 'arm', 'at91', 'bcmring', 'ep93xx', 'mach-types', 'misc' and 'w90x900...

diff --cc MAINTAINERS
index fa2a16def17afb765ad447f10b5dde634f83ded9,fa2a16def17afb765ad447f10b5dde634f83ded9,a67a99857e2a73f1ee97b85ef07bb28d24647da6,7bf1128d74f4cce000732e3e75e22ac50cc3c45d,fa2a16def17afb765ad447f10b5dde634f83ded9,9d1601ec13113037859a88c5174e5b475fa194fe,fa2a16def17afb765ad447f10b5dde634f83ded9..7b91c6e69d559bdf7f29b99c5f430c146b5def8c
--- 1/MAINTAINERS
--- 2/MAINTAINERS
--- 3/MAINTAINERS
--- 4/MAINTAINERS
--- 5/MAINTAINERS
--- 6/MAINTAINERS
--- 7/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 <leochen@broadcom.com>
++ ++++P:       Scott Branden <sbranden@broadcom.com>
++ ++++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 <leochen@broadcom.com>
++ ++++P:       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/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

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/mach-at91/board-sam9g20ek.c
Simple merge

diff --cc arch/arm/mach-at91/board-sam9rlek.c
Simple merge

diff --cc drivers/amba/bus.c
Simple merge

diff --cc drivers/video/Kconfig
Simple merge

diff --cc drivers/video/atmel_lcdfb.c
Simple merge