Merge branch 'for-next' into for-linus
authorAl Viro <viro@zeniv.linux.org.uk>
Thu, 12 Sep 2013 21:54:48 +0000 (17:54 -0400)
committerAl Viro <viro@zeniv.linux.org.uk>
Thu, 12 Sep 2013 21:54:48 +0000 (17:54 -0400)

Trivial merge