Merge branch 'next' into for-linus
authorJames Morris <jmorris@namei.org>
Thu, 25 Dec 2008 00:40:09 +0000 (11:40 +1100)
committerJames Morris <jmorris@namei.org>
Thu, 25 Dec 2008 00:40:09 +0000 (11:40 +1100)

Trivial merge