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

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

a19809875fb0952631767e2d2484bcd81b4365a1