Arnd Bergmann a94c7b0a8f 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 <arnd@arndb.de>		2012-03-16 20:25:17 +00:00
..
include/mach	ARM: big removal of now unused arch_idle()	2012-01-20 19:25:58 -05:00
clock.c	ARM: SPEAr600: Add device-tree support to SPEAr600 boards	2012-03-16 20:19:41 +00:00
Kconfig	ARM: SPEAr600: Add device-tree support to SPEAr600 boards	2012-03-16 20:19:41 +00:00
Makefile	ARM: SPEAr600: Add device-tree support to SPEAr600 boards	2012-03-16 20:19:41 +00:00
Makefile.boot	ARM: 7022/1: allow to detect conflicting zreladdrs	2011-10-17 09:12:40 +01:00
spear6xx.c	ARM: SPEAr600: Add device-tree support to SPEAr600 boards	2012-03-16 20:19:41 +00:00