From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Tue, 6 Sep 2011 01:13:31 +0000 (-0700)
Subject: Merge branch 'for-3.1' into for-3.2
X-Git-Tag: v3.2-rc1~127^2~2^2~1^2~49
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=11323e328336d21aafd7e814f337c20bb1cabd83;p=thirdparty%2Fkernel%2Flinux.git

Merge branch 'for-3.1' into for-3.2
---

11323e328336d21aafd7e814f337c20bb1cabd83