Merge branch 'iocb' into for-next

This commit is contained in:
Al Viro 2015-04-11 22:24:41 -04:00
commit c0fec3a98b
68 changed files with 201 additions and 271 deletions

View file

@ -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>

View file

@ -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"