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