Merge branch 'linus' into sched/urgent
[linux-2.6] / arch / m68knommu / include / asm / resource.h
1 #include <asm-m68k/resource.h>