From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Tue, 6 Sep 2011 01:13:31 +0000 (-0700)
Subject: Merge branch 'for-3.1' into for-3.2
X-Git-Tag: MMI-PSA29.97-13-9~16612^2~871
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=11323e328336d21aafd7e814f337c20bb1cabd83;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

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

11323e328336d21aafd7e814f337c20bb1cabd83