From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Wed, 19 Jan 2011 11:22:54 +0000 (+0000)
Subject: Merge branch 'for-2.6.38' into for-2.6.39
X-Git-Tag: MMI-PSA29.97-13-9~16612^2~1226^2~60
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=a1926d1745114789687ac029ae8c58944b7d2256;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

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

a1926d1745114789687ac029ae8c58944b7d2256