Merge branch 'topic/oxygen' into to-push
[linux-2.6] / arch / x86 / include / asm / resource.h
1 #include <asm-generic/resource.h>