From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Mon, 25 Jan 2010 14:52:48 +0000 (+0000)
Subject: Merge branch 'for-2.6.33' into for-2.6.34
X-Git-Tag: firefly_0821_release~9833^2~1382^2~7^2~199
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=f1487fcbe47cd2bc0c71e8598bf9eb6a82dec544;p=firefly-linux-kernel-4.4.55.git

Merge branch 'for-2.6.33' into for-2.6.34
---

f1487fcbe47cd2bc0c71e8598bf9eb6a82dec544