From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Sun, 14 Aug 2011 10:19:58 +0000 (+0900)
Subject: Merge branch 'for-3.1' into for-3.2
X-Git-Tag: v3.2-rc1~127^2~2^2~1^2~107
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=afe8db5f756ceb017dbcf2800f9a7302ee49a385;p=thirdparty%2Fkernel%2Flinux.git

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

afe8db5f756ceb017dbcf2800f9a7302ee49a385