Merge branch 'for-linus' into work.misc
authorAl Viro <viro@zeniv.linux.org.uk>
Sat, 9 Jan 2016 02:20:11 +0000 (21:20 -0500)
committerAl Viro <viro@zeniv.linux.org.uk>
Sat, 9 Jan 2016 02:20:11 +0000 (21:20 -0500)
1  2 
fs/internal.h
include/linux/fs.h

diff --cc fs/internal.h
Simple merge
Simple merge