From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Fri, 12 Aug 2011 02:48:29 +0000 (+0900)
Subject: Merge branch 'for-3.1' into for-3.2
X-Git-Tag: v3.2-rc1~127^2~2^2~1^2~122
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=42bef6866f0625108f695cae4719af6c34b99468;p=thirdparty%2Fkernel%2Flinux.git

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

42bef6866f0625108f695cae4719af6c34b99468