Len Brown 02e2407858 Merge branch 'linus' into release ...

Conflicts:
	arch/x86/kernel/acpi/sleep.c

Signed-off-by: Len Brown <len.brown@intel.com>

2011-03-23 02:34:54 -04:00

..

Makefile

ACPI, APEI, Generic Hardware Error Source memory error support

2010-05-19 22:41:16 -04:00

mce_amd.c

x86: Move llc_shared_map out of cpu_info

2011-01-26 08:44:49 +01:00

mce_intel.c

x86: Replace uses of current_cpu_data with this_cpu ops

2010-12-30 12:22:03 +01:00

mce-apei.c

ACPI, APEI, Add ERST record ID cache

2011-03-21 22:59:06 -04:00

mce-inject.c

x86: Fix common misspellings

2011-03-18 10:39:30 +01:00

mce-internal.h

ACPI, APEI, Use ERST for persistent storage of MCE

2010-05-19 22:41:40 -04:00

mce-severity.c

llseek: automatically add .llseek fop

2010-10-15 15:53:27 +02:00

mce.c

x86: Fix common misspellings

2011-03-18 10:39:30 +01:00

p5.c

x86, mce: make mce_disabled boolean

2009-06-16 16:56:07 -07:00

therm_throt.c

x86, mcheck, therm_throt.c: Export symbol platform_thermal_notify to allow coretemp to handler intr

2011-01-21 14:11:12 +01: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