Merge branch 'spear/dt' into next/dt2
Arnd Bergmann [Fri, 16 Mar 2012 20:25:17 +0000 (20:25 +0000)]
* spear/dt:
  ARM: SPEAr600: Add device-tree support to SPEAr600 boards

(update to v3.3-rc7)

Conflicts:
arch/arm/mach-spear6xx/spear6xx.c
arch/arm/mach-vexpress/Kconfig

The conflicts are between the previous contents of the next/dt2
branch and upstream changes from v3.3-rc7.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

1  2 
MAINTAINERS
arch/arm/Kconfig
arch/arm/mach-ux500/Kconfig
drivers/mmc/host/mmci.c
include/linux/of.h

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge