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/plat	ARM: big removal of now unused arch_idle()	2012-01-20 19:25:58 -05:00
clock.c	switch assorted clock drivers to debugfs_remove_recursive()	2011-07-20 20:47:51 -04:00
Kconfig	ARM: 6013/1: ST SPEAr: Added source files for SPEAr platform	2010-04-14 11:31:59 +01:00
Makefile	ARM: restart: spear: use new restart hook	2012-01-05 12:57:20 +00:00
padmux.c	arm: plat-spear: fix typo in kerneldoc	2010-07-19 11:04:14 +02:00
restart.c	ARM: restart: spear: use new restart hook	2012-01-05 12:57:20 +00:00
shirq.c	arm: Fold irq_set_chip/irq_set_handler	2011-03-29 14:47:58 +02:00
time.c	ARM: 7348/1: arm/spear600: fix one-shot timer	2012-02-27 11:18:40 +00:00