From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Thu, 3 Mar 2011 11:13:15 +0000 (+0000)
Subject: Merge branch 'for-2.6.38' into for-2.6.39
X-Git-Tag: MMI-PSA29.97-13-9~16612^2~1145^2~49
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=4955f631a409d55af8db9583bc5aea276a67fdea;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge branch 'for-2.6.38' into for-2.6.39
---

4955f631a409d55af8db9583bc5aea276a67fdea