Merge branch 'next' into for-linus
authorJames Morris <jmorris@namei.org>
Sun, 28 Dec 2008 22:57:38 +0000 (09:57 +1100)
committerJames Morris <jmorris@namei.org>
Sun, 28 Dec 2008 22:57:38 +0000 (09:57 +1100)

Trivial merge