From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Tue, 14 Apr 2009 12:22:37 +0000 (+0100)
Subject: Merge branch 'for-2.6.30' into for-2.6.31
X-Git-Tag: firefly_0821_release~12446^2~79^2~100
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=6967963d6d5cac40a091d075326f0e3ccb95c58a;p=firefly-linux-kernel-4.4.55.git

Merge branch 'for-2.6.30' into for-2.6.31
---

6967963d6d5cac40a091d075326f0e3ccb95c58a