Merge branch 'x86/cpu' into x86/core
[linux-2.6] / include / asm-x86 / resource.h
1 #include <asm-generic/resource.h>