Arnd Bergmann 40ba95fdf1 Merge branch 'depends/rmk/restart' into next/cleanup ... Conflicts: arch/arm/mach-at91/at91cap9.c arch/arm/mach-at91/at91sam9260.c arch/arm/mach-at91/at91sam9261.c arch/arm/mach-at91/at91sam9263.c arch/arm/mach-at91/at91sam9g45.c arch/arm/mach-at91/at91sam9rl.c arch/arm/mach-exynos/cpu.c arch/arm/mach-shmobile/board-kota2.c This resolves a bunch of conflicts between the arm-soc tree and changes from the arm tree that have gone upstream. Signed-off-by: Arnd Bergmann <arnd@arndb.de>		2012-01-07 11:51:28 +00:00
..
debug-macro.S	ARM: picoxcell: add extra temp register to addruart	2011-11-09 09:51:42 +00:00
entry-macro.S	ARM: picoxcell: convert to MULTI_IRQ_HANDLER	2011-11-15 18:14:04 +00:00
gpio.h	picoxcell: support for Picochip picoxcell devices	2011-09-26 16:11:56 +01:00
hardware.h	picoxcell: support for Picochip picoxcell devices	2011-09-26 16:11:56 +01:00
io.h	picoxcell: remove custom ioremap implementation	2011-09-26 16:12:56 +01:00
irqs.h	ARM: picoxcell: don't reserve irq_descs	2011-12-18 10:48:19 +00:00
map.h	picoxcell: support for Picochip picoxcell devices	2011-09-26 16:11:56 +01:00
picoxcell_soc.h	picoxcell: support for Picochip picoxcell devices	2011-09-26 16:11:56 +01:00
system.h	ARM: restart: remove the now empty arch_reset()	2012-01-05 12:57:22 +00:00
timex.h	picoxcell: support for Picochip picoxcell devices	2011-09-26 16:11:56 +01:00
uncompress.h	picoxcell: support for Picochip picoxcell devices	2011-09-26 16:11:56 +01:00