Merge branches 'work.namei', 'work.dcache' and 'work.iov_iter' into for-linus
authorAl Viro <viro@zeniv.linux.org.uk>
Thu, 15 Dec 2016 06:07:29 +0000 (01:07 -0500)
committerAl Viro <viro@zeniv.linux.org.uk>
Thu, 15 Dec 2016 06:07:29 +0000 (01:07 -0500)
1  2  3  4 
fs/ceph/file.c
fs/ceph/inode.c
fs/ceph/super.c

diff --cc fs/ceph/file.c
Simple merge
diff --cc fs/ceph/inode.c
Simple merge
diff --cc fs/ceph/super.c
Simple merge