Merge branch 'master'; commit 'v2.6.38-rc7' into next
authorJames Morris <jmorris@namei.org>
Mon, 7 Mar 2011 23:55:06 +0000 (10:55 +1100)
committerJames Morris <jmorris@namei.org>
Mon, 7 Mar 2011 23:55:06 +0000 (10:55 +1100)

Trivial merge