diff options
| author | James Morris <jmorris@namei.org> | 2008-09-22 02:41:56 +0200 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2008-09-22 02:41:56 +0200 |
| commit | ab2b49518e743962f71b94246855c44ee9cf52cc (patch) | |
| tree | 26b260a350f0a0a0d19b558bf147b812e3a1564c /arch/blackfin/include/asm/ioctl.h | |
| parent | Update selinux info in MAINTAINERS and Kconfig help text (diff) | |
| parent | Linux 2.6.27-rc7 (diff) | |
| download | linux-ab2b49518e743962f71b94246855c44ee9cf52cc.tar.xz linux-ab2b49518e743962f71b94246855c44ee9cf52cc.zip | |
Merge branch 'master' into next
Conflicts:
MAINTAINERS
Thanks for breaking my tree :-)
Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'arch/blackfin/include/asm/ioctl.h')
| -rw-r--r-- | arch/blackfin/include/asm/ioctl.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/blackfin/include/asm/ioctl.h b/arch/blackfin/include/asm/ioctl.h new file mode 100644 index 000000000000..b279fe06dfe5 --- /dev/null +++ b/arch/blackfin/include/asm/ioctl.h @@ -0,0 +1 @@ +#include <asm-generic/ioctl.h> |