From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Tue, 26 Apr 2011 10:46:47 +0000 (+0100)
Subject: Merge branch 'for-2.6.39' into for-2.6.40
X-Git-Tag: firefly_0821_release~3680^2~2691^2~1162
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=f9f4b1c71db9a0d74e0237c11a84f4e96e4ed146;p=firefly-linux-kernel-4.4.55.git

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

f9f4b1c71db9a0d74e0237c11a84f4e96e4ed146