Merge branch 'for-linus' into for-next
authorAl Viro <viro@zeniv.linux.org.uk>
Sun, 12 Apr 2015 02:29:51 +0000 (22:29 -0400)
committerAl Viro <viro@zeniv.linux.org.uk>
Sun, 12 Apr 2015 02:29:51 +0000 (22:29 -0400)

Trivial merge