]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
Merge remote-tracking branch 'ovl/misc' into work.misc
authorAl Viro <viro@zeniv.linux.org.uk>
Sat, 8 Oct 2016 15:00:01 +0000 (11:00 -0400)
committerAl Viro <viro@zeniv.linux.org.uk>
Sat, 8 Oct 2016 15:00:01 +0000 (11:00 -0400)
1  2 
fs/inode.c
fs/internal.h
fs/posix_acl.c
include/linux/fs.h

diff --cc fs/inode.c
Simple merge
diff --cc fs/internal.h
Simple merge
diff --cc fs/posix_acl.c
Simple merge
Simple merge