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-12-03 00:33:50 +05:30
2011-07-27 17:55:39 -03:00
2011-07-27 17:53:23 -03:00
2011-06-11 09:03:20 -03:00
2011-03-31 11:26:23 -03:00
2011-09-24 00:23:03 -03:00
2011-03-22 04:53:16 -03:00
2011-03-22 04:52:22 -03:00
2011-03-22 04:53:17 -03:00
2011-07-27 17:53:01 -03:00
2011-09-11 09:49:28 -03:00
2011-09-21 15:31:08 -03:00
2011-01-19 11:45:30 -02:00
2011-05-20 09:29:49 -03:00
2011-03-21 20:31:40 -03:00
2011-09-11 09:49:27 -03:00
2011-11-03 18:28:05 -02:00
2011-07-27 17:53:00 -03:00
2011-09-15 14:57:06 +02:00
2011-09-03 20:56:22 -03:00
2011-09-22 10:54:40 -03:00
2011-11-03 18:29:11 -02:00
2011-09-24 00:22:31 -03:00
2011-11-06 19:44:47 -08:00
2011-07-27 17:56:08 -03:00
2011-07-27 17:56:08 -03:00
2011-11-03 18:28:12 -02:00
2011-12-11 09:34:00 -02:00
2011-11-03 18:27:13 -02:00
2011-07-27 17:53:07 -03:00
2011-07-27 17:52:25 -03:00
2011-09-21 14:31:34 -03:00
2011-03-22 16:37:54 -03:00
2011-09-21 10:48:30 -03:00
2011-06-01 09:42:03 -03:00
2011-04-13 09:53:29 -03:00
2011-07-27 17:53:34 -03:00
2011-07-27 17:53:31 -03:00
2011-10-31 19:32:32 -04:00
2011-11-03 18:28:24 -02:00
2011-09-24 00:21:31 -03:00
2011-03-22 04:55:05 -03:00
2011-11-03 18:29:02 -02:00
2011-11-03 18:29:13 -02:00
2011-09-06 15:05:10 -03:00
2011-03-21 20:31:34 -03:00
2011-03-22 04:55:05 -03:00
2011-03-22 04:55:05 -03:00
2011-09-27 18:08:04 +02:00
2011-05-25 21:42:30 -03:00
2011-03-21 20:32:19 -03:00
40ba95fdf1