From: Arnd Bergmann Date: Fri, 16 Mar 2012 20:25:17 +0000 (+0000) Subject: Merge branch 'spear/dt' into next/dt2 X-Git-Url: http://git.alex.org.uk Merge branch 'spear/dt' into next/dt2 * 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 --- a94c7b0a8f31a8bcf3b136d469f7eb6b6b57bb78