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