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
..
ce4100	ce4100: fix a build error	2011-11-11 23:58:58 -02:00
efi	Revert "x86, efi: Calling __pa() with an ioremap()ed address is invalid"	2011-12-12 18:25:56 +01:00
geode	x86: geode: New PCEngines Alix system driver	2011-09-21 11:19:42 +02:00
iris	x86: platform: Move iris to x86/platform where it belongs	2010-11-20 10:37:05 +01:00
mrst	x86, mrst: Change the pmic_gpio device type to IPC	2011-12-05 12:42:15 +01:00
olpc	x86: Fix files explicitly requiring export.h for EXPORT_SYMBOL/THIS_MODULE	2011-10-31 19:30:35 -04:00
scx200	x86: Move scx200 to platform	2010-10-27 14:30:01 +02:00
sfi	Merge branch 'linus' into x86/apic-cleanups	2011-01-07 14:14:15 +01:00
uv	driver-core: remove sysdev.h usage.	2011-12-21 16:26:03 -08:00
visws	x86: visws: Fixup irq overhaul fallout	2011-04-04 16:51:15 +02:00
Makefile	x86: geode: New PCEngines Alix system driver	2011-09-21 11:19:42 +02:00