Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6
[linux-2.6] / arch / x86 / include / asm / resource.h
1 #include <asm-generic/resource.h>