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
Makefile
Makefile.boot
spear3xx.c	Merge branch 'spear/dt' into spear/clock	2012-05-14 17:31:45 +02:00
spear300.c	Merge branch 'spear/dt' into spear/clock	2012-05-14 17:31:45 +02:00
spear310.c	Merge branch 'spear/dt' into spear/clock	2012-05-14 17:31:45 +02:00
spear320.c	Merge branch 'spear/dt' into spear/clock	2012-05-14 17:31:45 +02:00