Arnd Bergmann a07613a54d
Merge branch 'samsung/dt' into samsung/cleanup ...
Conflicts:
arch/arm/mach-s3c64xx/Makefile
arch/arm/mach-s5pc100/Makefile
arch/arm/mach-s5pv210/Makefile
Pull in previously resolved conflicts:
The Makefiles were reorganized in the "rmk/restart" series and modified
in the "samsung/cleanup series". This also pulls in the other conflict
resolutions from the restart series against the samsung/dt series.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2012-01-09 16:01:00 +00:00
2011-11-17 12:58:07 -08:00
2012-01-07 11:51:28 +00:00
2011-12-07 22:26:56 +01:00
2011-10-31 19:32:02 -04:00
2011-12-16 10:05:14 -08:00
2011-12-09 14:07:12 -05:00
2011-12-20 10:25:04 -08:00
2012-01-03 15:17:56 +00:00
2011-11-11 22:28:33 -05:00
2011-11-07 10:13:52 -08:00
2011-11-25 21:55:07 -08:00
2011-10-31 19:31:43 -04:00
2011-11-14 23:31:35 +01:00
2012-01-07 12:42:17 +00:00
2011-11-24 01:59:38 -06:00
2011-11-06 19:44:47 -08:00
2011-12-15 14:16:47 -08:00
2011-12-23 10:06:54 +09:00
2011-12-26 21:07:27 -08:00
2011-12-02 08:25:46 -08:00
2011-12-12 08:31:21 -08:00
2011-11-08 18:34:16 -08:00
2011-12-18 11:46:42 +00:00
2011-11-29 15:46:15 +00:00
2011-11-07 10:13:52 -08:00
2011-12-19 09:19:49 -08:00
2012-01-07 12:42:17 +00:00
2011-12-29 17:36:15 -08:00
2011-11-29 18:39:37 -05:00
2011-11-15 22:41:50 -02:00
2011-10-31 19:32:13 -04:00
2011-11-08 22:35:48 +01:00
2011-12-23 09:57:48 +11:00
2012-01-07 20:23:00 +00:00
2011-10-31 19:31:52 -04:00
2011-10-31 19:31:53 -04:00
2011-12-20 18:53:26 +01:00
2011-11-21 20:36:05 -08:00
2012-01-09 16:01:00 +00:00
2012-01-07 11:51:28 +00:00
2012-01-07 20:23:00 +00:00
2011-10-31 19:31:54 -04:00
2011-12-12 14:41:45 -07:00
2011-12-19 17:18:43 +01:00
2011-10-31 19:31:01 -04:00
2011-12-18 14:10:16 -08:00
2011-11-06 19:44:47 -08:00
2011-11-10 09:02:12 +01:00
2011-12-05 13:07:28 -05:00
2011-11-07 10:13:52 -08:00
2011-12-05 17:06:37 +01:00
2011-11-02 16:07:02 -07:00
2011-11-08 14:51:46 +11:00
2011-12-06 11:38:32 +01:00
2011-12-09 07:50:29 -08:00
2011-11-28 18:58:31 +00:00
2012-01-07 20:23:00 +00:00
2011-12-14 15:40:43 +04:00
2011-12-04 10:46:58 -08:00
2011-12-15 11:02:07 +04:00
2011-10-31 19:31:57 -04:00
2011-11-11 16:16:25 +09:00
2011-12-23 10:10:21 +09:00
2011-12-09 14:07:12 -05:00
2011-12-13 16:13:15 -08:00
2011-12-06 06:00:59 +00:00
2011-11-06 20:38:49 -05:00
2011-12-23 10:07:01 +09:00
2011-10-31 19:32:10 -04:00
2012-01-07 11:51:28 +00:00
2011-10-31 19:32:19 -04:00
2011-11-22 00:56:17 +00:00
2011-11-24 13:04:48 +10:30
2011-11-06 19:44:47 -08:00
2012-01-07 20:23:00 +00:00
2011-12-19 09:30:35 -05:00
2011-10-31 19:32:01 -04:00
a07613a54d