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