Merge branch 'next' into for-linus
authorJames Morris <jmorris@namei.org>
Sun, 28 Feb 2010 22:36:31 +0000 (09:36 +1100)
committerJames Morris <jmorris@namei.org>
Sun, 28 Feb 2010 22:36:31 +0000 (09:36 +1100)

Trivial merge