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
..
Makefile	ACPI, APEI, Generic Hardware Error Source memory error support	2010-05-19 22:41:16 -04:00
mce_amd.c	cpu: convert 'cpu' and 'machinecheck' sysdev_class to a regular subsystem	2011-12-21 14:29:42 -08:00
mce_intel.c	locking, x86: mce: Annotate cmci_discover_lock as raw	2011-09-13 11:12:09 +02:00
mce-apei.c	x86: Fix files explicitly requiring export.h for EXPORT_SYMBOL/THIS_MODULE	2011-10-31 19:30:35 -04:00
mce-inject.c	x86/mce: Make mce_chrdev_ops 'static const'	2011-11-08 16:17:11 +01:00
mce-internal.h	cpu: convert 'cpu' and 'machinecheck' sysdev_class to a regular subsystem	2011-12-21 14:29:42 -08:00
mce-severity.c	x86, mce, severity: Clean up trivial coding style problems	2011-06-16 12:10:07 +02:00
mce.c	Merge branch 'driver-core-next' into Linux 3.2	2012-01-06 11:42:52 -08:00
p5.c	x86, mce: make mce_disabled boolean	2009-06-16 16:56:07 -07:00
therm_throt.c	cpu: convert 'cpu' and 'machinecheck' sysdev_class to a regular subsystem	2011-12-21 14:29:42 -08:00
threshold.c	x86, mce: enable MCE_INTEL for 32bit new MCE	2009-05-28 09:24:13 -07:00
winchip.c	x86, mce: unify mce.h	2009-06-16 16:56:07 -07:00