From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Wed, 24 Aug 2011 19:22:43 +0000 (+0100)
Subject: Merge branch 'for-3.1' into for-3.2
X-Git-Tag: MMI-PSA29.97-13-9~16612^2~888
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=b42af319f26bcb7d84b42b4bd0ca3b84ba94b160;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

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

b42af319f26bcb7d84b42b4bd0ca3b84ba94b160