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

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

f94f3cb37a1c4d44dd2070cc4a6165689bda9c92