1
0
Files
linux/Documentation
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-09-27 18:08:04 +02:00
2011-10-14 10:29:45 -03:00
2011-09-27 18:08:04 +02:00
2011-09-12 11:50:56 -07:00
2011-09-27 18:08:04 +02:00
2011-11-02 16:07:02 -07:00
2011-07-24 10:48:22 +02:00
2011-09-27 18:08:04 +02:00
2011-09-27 18:08:04 +02:00
2011-09-27 18:08:04 +02:00
2011-12-12 14:14:31 -08:00
2011-09-27 18:08:04 +02:00
2011-09-27 18:08:04 +02:00
2011-09-27 18:08:04 +02:00
2011-09-27 18:08:04 +02:00