Merge branch 'nsfs' into for-next
authorAl Viro <viro@zeniv.linux.org.uk>
Thu, 11 Dec 2014 02:31:59 +0000 (21:31 -0500)
committerAl Viro <viro@zeniv.linux.org.uk>
Thu, 11 Dec 2014 02:31:59 +0000 (21:31 -0500)

Trivial merge