Merge branch 'next' into for-linus
authorJames Morris <jmorris@namei.org>
Sun, 12 Oct 2008 22:35:14 +0000 (09:35 +1100)
committerJames Morris <jmorris@namei.org>
Sun, 12 Oct 2008 22:35:14 +0000 (09:35 +1100)

Trivial merge