From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Thu, 11 Aug 2011 03:30:26 +0000 (+0900)
Subject: Merge branch 'for-3.1' into for-3.2
X-Git-Tag: MMI-PSA29.97-13-9~16612^2~946
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=10645a7c68fee0548e70c56eccc9eec2abab0166;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

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

10645a7c68fee0548e70c56eccc9eec2abab0166