Merge branch 'next' into for-linus
authorJames Morris <jmorris@namei.org>
Tue, 6 Jan 2009 22:58:22 +0000 (09:58 +1100)
committerJames Morris <jmorris@namei.org>
Tue, 6 Jan 2009 22:58:22 +0000 (09:58 +1100)

Trivial merge