Merge branch 'linus' into x86/xen
[linux-2.6] / arch / m68knommu / include / asm / ioctls.h
1 #include <asm-m68k/ioctls.h>