diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2015-04-11 22:24:41 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2015-04-11 22:24:41 -0400 |
commit | c0fec3a98bd6c4d992f191ee1aa0b3599213f3d4 (patch) | |
tree | 24b4533146ce10bcf4af6fca0971311ece523d58 /fs/ubifs/file.c | |
parent | c1b8940b42bb6487b10f2267a96b486276ce9ff7 (diff) | |
parent | e2e40f2c1ed433c5e224525c8c862fd32e5d3df2 (diff) | |
download | op-kernel-dev-c0fec3a98bd6c4d992f191ee1aa0b3599213f3d4.zip op-kernel-dev-c0fec3a98bd6c4d992f191ee1aa0b3599213f3d4.tar.gz |
Merge branch 'iocb' into for-next
Diffstat (limited to 'fs/ubifs/file.c')
-rw-r--r-- | fs/ubifs/file.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/ubifs/file.c b/fs/ubifs/file.c index e627c0a..c3d15fe 100644 --- a/fs/ubifs/file.c +++ b/fs/ubifs/file.c @@ -50,7 +50,6 @@ */ #include "ubifs.h" -#include <linux/aio.h> #include <linux/mount.h> #include <linux/namei.h> #include <linux/slab.h> |