From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Wed, 31 Aug 2011 08:46:42 +0000 (+0100)
Subject: Merge branch 'for-3.1' into for-3.2
X-Git-Tag: v3.2-rc1~127^2~2^2~1^2~61
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0f8dd4ce4775806196300dc075ba8d4f1f9b605d;p=thirdparty%2Flinux.git

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

0f8dd4ce4775806196300dc075ba8d4f1f9b605d