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