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