Merge branch 'linus' into release
[cascardo/linux.git] / arch / x86 / include / asm / resource.h
1 #include <asm-generic/resource.h>