Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
[linux-2.6] / include / asm-x86_64 / cpu.h
1 #include <asm-i386/cpu.h>