From: James Morris <jmorris@namei.org>
Date: Thu, 9 Jun 2011 00:24:49 +0000 (+1000)
Subject: Merge branch 'linus'; commit 'v3.0-rc2' into next
X-Git-Tag: v3.1-rc1~133^2~53
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f55cf3c76a3b2e4bdcfea4f95c9d527663b41ece;p=thirdparty%2Fkernel%2Flinux.git

Merge branch 'linus'; commit 'v3.0-rc2' into next
---