Merge branch 'next' into for-linus
authorJames Morris <jmorris@namei.org>
Tue, 24 May 2011 12:55:24 +0000 (22:55 +1000)
committerJames Morris <jmorris@namei.org>
Tue, 24 May 2011 12:55:24 +0000 (22:55 +1000)

Trivial merge