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-03-31 11:26:23 -03:00
2010-03-07 10:30:57 +00:00
2011-03-15 16:02:27 +00:00
2011-03-15 16:02:22 +00:00
2010-10-15 15:53:27 +02:00
2011-06-28 20:01:25 +00:00
2010-03-07 10:30:57 +00:00
2011-07-26 21:22:15 +00:00
2011-07-26 21:22:15 +00:00
2011-01-12 13:51:29 +00:00
2011-08-08 14:29:32 -04:00
2011-04-10 17:01:04 +02:00
2011-03-15 16:02:27 +00:00
2011-03-15 16:02:39 +00:00
2011-12-26 15:14:24 +01:00
2010-03-07 10:30:57 +00:00
2011-03-17 17:09:29 -07:00
2011-03-29 11:05:48 +00:00
2011-07-22 08:57:38 +00:00
2010-10-15 15:53:27 +02:00
2011-11-05 21:16:15 +01:00
2011-01-12 10:23:04 +00:00
2011-06-28 07:43:00 +00:00
2010-03-07 10:30:57 +00:00
2011-12-26 15:14:38 +01:00
2011-03-15 16:02:22 +00:00
2010-03-07 10:30:57 +00:00
2010-03-30 22:02:32 +09:00
2011-07-26 21:19:16 +00:00
2010-03-07 10:30:57 +00:00
2011-07-26 16:49:47 -07:00
2011-03-15 16:02:06 +00:00
2009-09-18 08:39:37 +00:00
2011-07-22 08:55:23 +00:00
2011-07-26 21:28:23 +00:00
2010-05-25 09:05:56 +00:00
2008-05-28 11:51:32 +00:00
2011-12-27 20:35:59 +01:00
2010-03-07 10:30:57 +00:00
2010-03-07 10:30:57 +00:00
2011-03-15 16:01:57 +00:00
2011-11-15 11:45:16 +01:00
2011-01-12 10:24:52 +00:00
2011-09-20 14:28:24 +02:00
2011-02-08 15:07:45 +10:00
2011-03-15 16:02:27 +00:00
2011-11-15 11:45:16 +01:00
2011-03-29 11:05:48 +00:00
2010-03-07 10:30:57 +00:00
2011-05-18 12:32:23 -06:00
2011-11-05 21:16:15 +01:00
2011-07-22 08:59:43 +00:00
2010-03-07 10:30:57 +00:00
2010-03-30 22:02:32 +09:00
2011-08-02 08:22:54 +00:00
2011-01-12 13:51:23 +00:00
2011-11-05 21:15:38 +01:00
2010-08-05 13:26:22 +01:00
2011-07-26 21:21:29 +00:00
2011-03-10 22:40:05 -07:00
2011-03-15 16:02:27 +00:00
2009-06-08 13:05:00 -04:00
2011-07-22 08:56:41 +00:00
2011-03-15 16:02:22 +00:00
2011-11-18 09:52:10 -08:00
2010-03-07 10:30:57 +00:00
2010-04-03 22:22:20 +00:00
2010-05-25 09:03:52 +00:00
2011-03-29 11:05:48 +00:00
2010-03-07 10:30:57 +00:00
2011-05-26 19:45:06 +02:00
2011-02-28 13:22:46 -07:00
2011-11-16 22:04:17 +01:00
2009-07-09 18:29:38 +00:00
2011-11-05 21:16:15 +01:00
2009-06-18 07:30:30 +00:00
2011-07-26 16:49:47 -07:00
2011-03-15 16:02:27 +00:00
2011-09-20 14:32:00 +02:00
2011-03-15 16:02:27 +00:00
2011-11-05 21:15:10 +01:00
2009-09-18 08:39:37 +00:00
2011-07-26 21:21:16 +00:00
2009-06-18 07:30:57 +00:00
2011-08-02 08:22:49 +00:00
2011-09-27 18:08:04 +02:00
2011-03-29 11:56:22 +00:00
2011-12-26 15:14:31 +01:00
2011-03-29 11:05:57 +00:00
2011-01-12 13:51:16 +00:00
2011-10-31 19:32:22 -04:00
2011-03-15 16:02:27 +00:00
2010-05-25 09:05:46 +00:00
2010-03-07 10:30:59 +00:00
2011-11-05 21:16:39 +01:00
2009-06-18 07:30:30 +00:00
2011-03-15 16:02:27 +00:00
2008-08-06 13:21:09 +00:00
2010-03-07 10:30:57 +00:00
2008-10-28 19:16:11 +00:00
2011-07-28 08:01:18 +00:00
2011-09-20 14:22:28 +02:00
2011-07-28 08:01:04 +00:00
2009-03-25 09:07:04 +00:00
2010-03-07 10:30:57 +00:00
2008-10-28 19:16:11 +00:00
2011-03-15 16:02:27 +00:00
2011-11-05 21:16:15 +01:00
2011-11-05 21:16:15 +01:00
2011-11-16 22:00:10 +01:00
2010-06-07 15:55:03 +00:00
2011-03-15 16:02:18 +00:00
ff4b8a57f0