Merge branch 'next' into for-linus
authorJames Morris <jmorris@namei.org>
Tue, 15 Mar 2011 22:41:17 +0000 (09:41 +1100)
committerJames Morris <jmorris@namei.org>
Tue, 15 Mar 2011 22:41:17 +0000 (09:41 +1100)

Trivial merge