Len Brown 95ee46aa86 Merge branch 'linus' into release ...

Conflicts:
	drivers/acpi/debug.c

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

2010-08-15 01:06:31 -04:00

..

Makefile

ACPI, APEI, Generic Hardware Error Source memory error support

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

mce_amd.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

mce_intel.c

x86, mce: Fix MSR_IA32_MCI_CTL2 CMCI threshold setup

2010-06-10 21:27:36 -07:00

mce-apei.c

ACPI, APEI, Rename CPER and GHES severity constants

2010-08-08 14:55:26 -04:00

mce-inject.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

mce-internal.h

ACPI, APEI, Use ERST for persistent storage of MCE

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

mce-severity.c

x86, mce: Fix compilation with !CONFIG_DEBUG_FS in mce-severity.c

2009-09-14 12:01:04 -07:00

mce.c

Merge branch 'x86-mce-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

2010-08-06 16:24:51 -07:00

p5.c

x86, mce: make mce_disabled boolean

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

therm_throt.c

x86, hwmon: Package Level Thermal/Power: power limit

2010-08-03 15:58:56 -07: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