Merge branch 'iocb' into for-next

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

View File

@@ -19,7 +19,6 @@
#include <linux/pipe_fs_i.h>
#include <linux/swap.h>
#include <linux/splice.h>
#include <linux/aio.h>
MODULE_ALIAS_MISCDEV(FUSE_MINOR);
MODULE_ALIAS("devname:fuse");