From: James Morris <jmorris@namei.org>
Date: Mon, 8 Aug 2011 03:39:40 +0000 (+1000)
Subject: Merge branch 'linus'; commit 'v3.1-rc1' into next
X-Git-Tag: v3.2-rc1~190^2~67
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=94b12d4481b3f32004f13b52fb64d5cf75f551aa;p=users%2Fhch%2Fmisc.git

Merge branch 'linus'; commit 'v3.1-rc1' into next
---