Merge branch 'next' into for-linus
authorJames Morris <jmorris@namei.org>
Mon, 17 May 2010 22:57:00 +0000 (08:57 +1000)
committerJames Morris <jmorris@namei.org>
Mon, 17 May 2010 22:57:00 +0000 (08:57 +1000)

Trivial merge