Merge branches 'x86-alternatives-for-linus', 'x86-fpu-for-linus', 'x86-hwmon-for...
[pandora-kernel.git] / kernel / cpu.c
diff --cc kernel/cpu.c
Simple merge