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

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

fef24d92a649ba1415c0a834259048153a2ab30a