Merge branch 'linus' into cpus4096
[pandora-kernel.git] / kernel / cpu.c
diff --cc kernel/cpu.c
Simple merge