Merge branch 'for-linus' of git://neil.brown.name/md
[linux-2.6] / arch / m68knommu / include / asm / resource.h
1 #include <asm-m68k/resource.h>