From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Tue, 18 Jan 2011 19:11:23 +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~61
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=492e917635a0fa05439bb562fd51577efc9cef30;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

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

492e917635a0fa05439bb562fd51577efc9cef30