Merge branch 'ovl-fixes' into for-linus
authorAl Viro <viro@zeniv.linux.org.uk>
Wed, 11 May 2016 04:00:29 +0000 (00:00 -0400)
committerAl Viro <viro@zeniv.linux.org.uk>
Wed, 11 May 2016 04:00:29 +0000 (00:00 -0400)
1  2 
fs/namei.c
fs/splice.c

diff --cc fs/namei.c
Simple merge
diff --cc fs/splice.c
Simple merge