diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2012-10-28 22:28:52 +0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2012-10-28 22:29:19 +0400 |
| commit | 3bd7bf1f0fe14f591c089ae61bbfa9bd356f178a (patch) | |
| tree | 0058693cc9e70b7461dae551f8a19aff2efd13ca /include/linux/ioctl.h | |
| parent | f16f84937d769c893492160b1a8c3672e3992beb (diff) | |
| parent | e657e078d3dfa9f96976db7a2b5fd7d7c9f1f1a6 (diff) | |
| download | linux-3bd7bf1f0fe14f591c089ae61bbfa9bd356f178a.tar.xz | |
Merge branch 'master' into for-next
Sync up with Linus' tree to be able to apply Cesar's patch
against newer version of the code.
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'include/linux/ioctl.h')
| -rw-r--r-- | include/linux/ioctl.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/include/linux/ioctl.h b/include/linux/ioctl.h deleted file mode 100644 index aa91eb3951ef..000000000000 --- a/include/linux/ioctl.h +++ /dev/null @@ -1,7 +0,0 @@ -#ifndef _LINUX_IOCTL_H -#define _LINUX_IOCTL_H - -#include <asm/ioctl.h> - -#endif /* _LINUX_IOCTL_H */ - |