Merge branch 'iocb' into for-next

2015-04-11 22:24:41 -04:00
parent c1b8940b42 e2e40f2c1e
commit c0fec3a98b
68 changed files with 201 additions and 271 deletions
--- a/fs/ntfs/file.c
+++ b/fs/ntfs/file.c
@@ -28,7 +28,6 @@
 #include <linux/swap.h>
 #include <linux/uio.h>
 #include <linux/writeback.h>
-#include <linux/aio.h>

 #include <asm/page.h>
 #include <asm/uaccess.h>
--- a/fs/ntfs/inode.c
+++ b/fs/ntfs/inode.c
@@ -28,7 +28,6 @@
 #include <linux/quotaops.h>
 #include <linux/slab.h>
 #include <linux/log2.h>
-#include <linux/aio.h>

 #include "aops.h"
 #include "attrib.h"