Greg Kroah-Hartman ff4b8a57f0
Merge branch 'driver-core-next' into Linux 3.2 ...
This resolves the conflict in the arch/arm/mach-s3c64xx/s3c6400.c file,
and it fixes the build error in the arch/x86/kernel/microcode_core.c
file, that the merge did not catch.
The microcode_core.c patch was provided by Stephen Rothwell
<sfr@canb.auug.org.au > who was invaluable in the merge issues involved
with the large sysdev removal process in the driver-core tree.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de >
2012-01-06 11:42:52 -08:00
2011-04-21 16:59:30 -07:00
2010-08-04 10:26:03 +10:00
2010-06-22 19:40:29 +10:00
2009-12-12 13:08:14 +01:00
2009-12-11 21:24:44 -07:00
2011-11-17 16:26:07 +11:00
2011-11-17 16:26:07 +11:00
2010-05-19 08:36:48 +01:00
2010-06-01 08:55:52 -07:00
2009-11-26 09:16:19 +01:00
2010-09-02 14:07:30 +10:00
2011-10-28 14:58:53 +02:00
2011-03-31 11:26:23 -03:00
2009-11-11 21:43:19 -06:00
2011-03-31 11:26:23 -03:00
2011-07-12 13:16:58 +03:00
2011-05-04 15:22:59 +10:00
2011-12-29 16:31:57 -08:00
2011-06-20 11:21:48 +10:00
2009-12-11 21:24:44 -07:00
2011-09-20 09:19:35 +10:00
2011-09-20 09:19:35 +10:00
2011-06-27 08:30:26 -05:00
2011-07-21 14:10:00 +02:00
2011-07-26 16:49:47 -07:00
2011-06-27 08:30:19 -05:00
2011-06-29 17:47:48 +10:00
2011-07-12 13:16:59 +03:00
2011-05-04 15:19:26 +10:00
2011-09-20 16:09:50 +10:00
2009-12-12 22:24:30 -07:00
2011-11-08 14:51:46 +11:00
2010-10-14 00:54:38 -05:00
2010-08-12 14:00:15 +01:00
2011-06-27 08:30:19 -05:00
2011-05-20 08:46:49 -05:00
2011-05-26 13:38:57 +10:00
2011-11-17 16:26:07 +11:00
2009-12-10 20:08:15 -06:00
2010-02-17 14:02:49 +11:00
2010-10-26 16:52:08 -07:00
2011-09-20 09:19:40 +10:00
2011-07-12 13:16:55 +03:00
2011-07-01 13:10:21 +10:00
2011-07-01 16:20:04 +02:00
2011-03-02 16:50:24 +11:00
2010-10-18 11:03:21 +02:00
2009-11-11 21:43:18 -06:00
2011-01-12 18:02:46 -06:00
2011-05-06 13:19:01 +10:00
2011-04-27 14:18:31 +10:00
2011-05-19 14:30:43 +10:00
2011-02-17 14:16:30 -08:00
2011-07-26 16:49:47 -07:00
2011-01-21 14:08:33 +11:00
2011-08-05 14:47:55 +10:00
2010-08-14 22:26:51 +02:00
2011-08-05 14:47:56 +10:00
2011-08-11 13:50:37 -04:00
2010-10-29 13:14:42 -05:00
2010-05-20 21:04:21 -05:00
2011-03-31 11:26:23 -03:00
2011-05-22 08:47:53 -04:00
2011-07-12 13:16:54 +03:00
2010-05-17 12:18:23 +03:00
2011-12-26 13:28:00 +02:00
2011-09-25 19:52:30 +03:00
2011-12-26 13:28:00 +02:00
2011-07-12 13:16:54 +03:00
2011-07-12 13:16:39 +03:00
2010-09-02 14:07:32 +10:00
2011-09-25 19:52:30 +03:00
2010-10-24 10:52:23 +02:00
2011-09-25 19:52:27 +03:00
2011-11-17 16:30:25 +02:00
2010-06-09 11:12:36 +02:00
2011-07-26 16:49:47 -07:00
2011-05-19 14:30:41 +10:00
2011-11-08 14:51:59 +11:00
2011-11-06 19:44:47 -08:00
2011-06-10 14:55:36 +02:00
2009-12-09 17:09:14 +11:00
2010-08-05 12:56:07 +10:00
2011-05-04 15:19:26 +10:00
2010-05-05 09:11:10 -04:00
2011-09-20 09:19:40 +10:00
2011-09-20 09:19:40 +10:00
2011-09-20 09:19:40 +10:00
2011-06-27 14:13:09 -07:00
2009-12-15 16:28:34 +10:30
2010-08-06 20:49:18 -06:00
2010-08-06 20:49:18 -06:00
2010-08-01 17:06:44 -06:00
2011-09-20 09:19:42 +10:00
2010-02-17 14:03:15 +11:00
2011-03-04 18:19:04 +11:00
2011-09-20 16:10:03 +10:00
2011-09-20 16:10:03 +10:00
2010-08-11 08:59:21 -07:00
2011-09-20 09:19:40 +10:00
2011-09-20 09:19:40 +10:00
2010-02-03 17:39:48 +11:00
2010-05-06 16:49:26 +10:00
2011-03-31 11:26:23 -03:00
2011-07-26 17:12:10 -07:00
2011-07-26 17:12:10 -07:00
2010-07-09 11:28:30 +10:00
2010-03-05 03:04:08 -06:00
2010-03-05 03:04:08 -06:00
2010-06-08 23:31:27 +02:00
2009-10-30 17:20:57 +11:00
2010-05-06 16:49:27 +10:00
2011-05-25 08:39:16 -07:00
2010-10-26 16:52:08 -07:00
2011-06-29 17:48:16 +10:00
2011-03-02 16:50:24 +11:00
2011-03-31 11:26:23 -03:00
2009-12-06 17:06:19 +01:00
2011-07-12 13:16:31 +03:00
2011-07-21 12:38:32 -07:00
2010-10-13 16:19:20 +11:00
2011-06-22 21:44:55 -05:00
2011-07-26 16:49:47 -07:00
2011-06-29 17:48:22 +10:00
2009-12-09 17:10:37 +11:00
2011-09-20 09:19:40 +10:00
2011-04-18 13:08:21 +10:00
2011-05-10 10:16:21 +02:00
2011-03-21 11:18:14 +11:00
2011-03-30 15:38:02 +02:00
2011-09-27 18:08:04 +02:00
2011-05-06 13:32:41 +10:00
2011-11-17 16:26:07 +11:00
2010-03-05 03:04:08 -06:00
2011-08-05 14:47:55 +10:00
2011-06-02 15:29:08 -05:00
2011-09-20 09:19:46 +10:00
2011-01-27 12:30:39 +01:00
2010-08-07 18:15:50 +02:00
2011-04-20 17:01:19 +10:00
2011-11-16 14:47:54 +11:00
2011-07-01 13:00:21 +10:00
2010-05-26 08:30:15 -07:00
2011-09-20 15:53:24 +10:00
2011-07-21 14:10:00 +02:00
2011-09-20 15:53:23 +10:00
2009-12-14 23:55:32 +01:00
2010-02-17 14:03:15 +11:00
2011-03-31 11:26:23 -03:00
2011-12-21 14:29:42 -08:00
2011-11-17 16:26:07 +11:00
2011-05-26 13:38:57 +10:00
2010-03-12 15:52:32 -08:00
2011-10-31 17:30:44 -07:00
2011-07-26 16:49:43 -07:00
2010-08-10 13:47:39 -07:00
2011-05-26 13:38:57 +10:00
2010-09-02 14:07:31 +10:00
2011-05-25 08:39:16 -07:00
2011-04-20 16:59:20 +10:00
2011-12-21 14:29:42 -08:00
2011-03-23 19:47:18 -07:00
2011-11-06 17:12:03 -08:00
2011-04-26 23:31:11 -07:00
2011-10-31 17:30:44 -07:00
2011-03-31 11:26:23 -03:00
2011-05-06 13:32:35 +10:00
2011-11-08 14:51:46 +11:00
ff4b8a57f0