From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Wed, 6 Apr 2011 14:15:15 +0000 (+0900)
Subject: Merge branch 'for-2.6.39' into for-2.6.40
X-Git-Tag: firefly_0821_release~3680^2~2691^2~1223
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=fa880004682cf0d10e7a7c71dc8d56bbd67ac3d5;p=firefly-linux-kernel-4.4.55.git

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

fa880004682cf0d10e7a7c71dc8d56bbd67ac3d5