Merge branch 'for-linus' into for-next
authorAl Viro <viro@zeniv.linux.org.uk>
Wed, 17 Jun 2015 18:44:05 +0000 (14:44 -0400)
committerAl Viro <viro@zeniv.linux.org.uk>
Wed, 17 Jun 2015 18:44:05 +0000 (14:44 -0400)
1  2 
fs/ufs/inode.c
fs/ufs/namei.c

diff --cc fs/ufs/inode.c
Simple merge
diff --cc fs/ufs/namei.c
Simple merge