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
..
debug-macro.S	ARM: spear: remove most mach/*.h header contents	2012-04-22 22:44:04 +02:00
gpio.h	ARM: gpio: make trivial GPIOLIB implementation the default	2011-08-12 08:54:19 +01:00
keyboard.h	Input: spear-keyboard - remove kbd_set_plat_data()	2012-03-19 17:55:39 -07:00
pl080.h	SPEAr: Add PL080 DMA support for 3xx and 6xx	2012-04-22 22:41:35 +02:00
shirq.h	ARM: 6091/1: ST SPEAr: Adding support for shared irq layer	2010-05-04 16:54:54 +01:00
timex.h
uncompress.h	ARM: spear: remove most mach/*.h header contents	2012-04-22 22:44:04 +02:00