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: MMI-PSA29.97-13-9~16612^2~929
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=afe8db5f756ceb017dbcf2800f9a7302ee49a385;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

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

afe8db5f756ceb017dbcf2800f9a7302ee49a385