Merge branch 'master' into upstream
[linux-2.6] / include / asm-i386 / ioctl.h
1 #include <asm-generic/ioctl.h>