From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Fri, 6 Jan 2012 19:42:52 +0000 (-0800)
Subject: Merge branch 'driver-core-next' into Linux 3.2
X-Git-Tag: v3.3-rc1~174^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ff4b8a57f0aaa2882d444ca44b2b9b333d22a4df;p=pandora-kernel.git

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>
---

ff4b8a57f0aaa2882d444ca44b2b9b333d22a4df
Reading git-diff-tree failed