Merge branch 'for-lustre' into for-next
authorAl Viro <viro@zeniv.linux.org.uk>
Wed, 19 Nov 2014 18:01:59 +0000 (13:01 -0500)
committerAl Viro <viro@zeniv.linux.org.uk>
Wed, 19 Nov 2014 18:01:59 +0000 (13:01 -0500)

Trivial merge