commit ff4b8a57f0aaa2882d444ca44b2b9b333d22a4df
author Greg Kroah-Hartman <gregkh@suse.de> Fri Jan 06 11:42:52 2012 -0800
committer Greg Kroah-Hartman <gregkh@suse.de> Fri Jan 06 11:42:52 2012 -0800
tree d851c923f85566572112d4c0f884cff388a3cc05
parent 805a6af8dba5dfdd35ec35dc52ec0122400b2610
parent ea04018e6bc5ddb2f0466c0e5b986bd4901b7e8e

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>