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
..
2011-11-02 14:15:41 +01:00
2011-06-01 19:29:39 -07:00
2011-03-22 17:44:16 -07:00
2011-08-26 17:26:35 -07:00
2011-03-31 11:26:23 -03:00
2009-09-23 07:39:43 -07:00
2011-05-26 17:12:33 -07:00
2011-05-26 17:12:33 -07:00