Merge branch 'next' into for-linus
authorJames Morris <jmorris@namei.org>
Fri, 10 Oct 2008 00:09:47 +0000 (11:09 +1100)
committerJames Morris <jmorris@namei.org>
Fri, 10 Oct 2008 00:09:47 +0000 (11:09 +1100)

Trivial merge