Merge remote branch 'origin' into for-next
authorAl Viro <viro@zeniv.linux.org.uk>
Thu, 27 Sep 2012 01:07:20 +0000 (21:07 -0400)
committerAl Viro <viro@zeniv.linux.org.uk>
Thu, 27 Sep 2012 01:07:20 +0000 (21:07 -0400)

Trivial merge