From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Wed, 13 Apr 2011 17:37:18 +0000 (-0700)
Subject: Merge branch 'for-2.6.39' into for-2.6.40
X-Git-Tag: MMI-PSA29.97-13-9~16612^2~1186
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=f030d60b30855e18ac5bf080fa9e576147623d18;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge branch 'for-2.6.39' into for-2.6.40
---

f030d60b30855e18ac5bf080fa9e576147623d18