Merge branch 'linus' into x86/cpu
[linux-2.6] / arch / m68knommu / include / asm / ioctl.h
1 #include <asm-generic/ioctl.h>