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
2011-03-31 11:26:23 -03:00
2011-03-31 11:26:23 -03:00
2011-03-22 17:43:59 -07:00
2011-03-22 17:43:59 -07:00
2011-07-26 16:49:47 -07:00
2011-10-03 15:52:38 +00:00
2011-10-03 15:52:38 +00:00
2011-10-03 15:52:22 +00:00
2011-03-31 11:26:23 -03:00
2009-01-12 20:56:32 +01:00
2008-07-24 10:47:34 -07:00
2009-12-16 07:20:04 -08:00
2009-05-06 16:36:10 -07:00
2011-09-01 00:31:05 +00:00
2011-03-22 16:18:51 +09:00
2011-03-31 11:26:23 -03:00
2011-03-31 11:26:23 -03:00
2010-05-25 08:07:09 -07:00
2011-03-22 16:07:32 +09:00
2011-09-27 18:08:04 +02:00
2010-02-27 18:31:16 +01:00
2010-02-27 18:31:14 +01:00
2011-09-14 16:40:52 +00:00
2008-04-28 08:58:41 -07:00
2011-10-03 15:52:22 +00:00
2011-03-31 11:26:23 -03:00
2011-10-03 15:52:22 +00:00
2011-10-03 15:52:22 +00:00
2010-12-21 01:05:43 +09:00
2011-10-03 15:52:22 +00:00
2011-10-03 15:52:22 +00:00
2010-05-25 08:07:09 -07:00
2011-06-24 17:14:39 +09:00
2011-03-31 11:26:23 -03:00
2011-03-31 11:26:23 -03:00
2011-03-31 11:26:23 -03:00
2010-06-16 18:05:05 +02:00
2011-10-03 15:52:22 +00:00
2011-06-24 17:14:39 +09:00
2010-02-27 18:31:13 +01:00
2011-07-04 16:02:48 +09:00
2011-10-03 15:52:22 +00:00