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