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)
commit37a438f95c9ced08215f5b80c5eb3867994bef80
tree932b180b18a96120ac68f85f7de0d3cdac320b1b
parentd64e591da85b8f00f2039e5ef3b437e6b5accaae
parent2e762df67b26ded36b90bc812bd4a5c9d47f9ed7
Merge branch 'for-linus' into for-next
fs/ufs/inode.c
fs/ufs/namei.c