Arnd Bergmann 66a2886d86 Merge branch 'spear/dt' into spear/clock ... Conflicts: arch/arm/mach-spear3xx/clock.c arch/arm/mach-spear3xx/include/mach/generic.h arch/arm/mach-spear3xx/include/mach/misc_regs.h arch/arm/mach-spear3xx/spear320.c arch/arm/mach-spear6xx/clock.c arch/arm/mach-spear6xx/include/mach/misc_regs.h Resolve even more merge conflicts. Signed-off-by: Arnd Bergmann <arnd@arndb.de>		2012-05-14 17:31:45 +02:00
..
include/mach	Merge branch 'spear/dt' into spear/clock	2012-05-14 17:31:45 +02:00
Kconfig	ARM: SPEAr600: Add device-tree support to SPEAr600 boards	2012-03-16 20:19:41 +00:00
Makefile	SPEAr: Switch to common clock framework	2012-05-12 21:44:12 +02:00
Makefile.boot	SPEAr6xx: Add compilation support for dtbs using 'make dtbs'	2012-04-22 22:41:34 +02:00
spear6xx.c	Merge branch 'spear/dt' into spear/clock	2012-05-14 17:31:45 +02:00