Ingo Molnar 65fb0d23fc Merge branch 'linus' into cpumask-for-linus ...

Conflicts:
	arch/x86/kernel/cpu/common.c

2009-03-30 23:53:32 +02:00

..

k7.c

…

Makefile

…

mce_32.c

…

mce_64.c

…

mce_amd_64.c

…

mce_intel_64.c

…

mce.h

…

non-fatal.c

…

p4.c

…

p5.c

…

p6.c

…

therm_throt.c

…

threshold.c

…

winchip.c

…