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
..
bridge-regs.h	ARM: Remove dependency of plat-orion time code on mach directory includes.	2011-03-03 16:27:01 -05:00
debug-macro.S	ARM: add an extra temp register to the low level debugging addruart macro	2011-09-26 10:11:25 -04:00
dove.h	ARM: mach-dove: remove inclusion of <mach/vmalloc.h>	2011-11-15 22:30:38 -05:00
entry-macro.S	ARM: add base support for Marvell Dove SoC	2009-11-27 15:43:06 -05:00
gpio.h	ARM: Remove dependency of plat-orion GPIO code on mach directory includes.	2011-03-03 16:27:02 -05:00
hardware.h	ARM: set vga memory base at run-time	2011-07-12 11:19:29 -05:00
io.h	ARM: dove: fix __io() definition to use bus based offset	2010-09-19 22:43:42 -04:00
irqs.h	ARM: Dove: Remove PXA compatibility IRQ defines.	2011-03-03 16:27:03 -05:00
pm.h	ARM: add base support for Marvell Dove SoC	2009-11-27 15:43:06 -05:00
system.h	ARM: restart: remove the now empty arch_reset()	2012-01-05 12:57:22 +00:00
timex.h	ARM: add base support for Marvell Dove SoC	2009-11-27 15:43:06 -05:00
uncompress.h	ARM: add base support for Marvell Dove SoC	2009-11-27 15:43:06 -05:00