From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Fri, 7 Aug 2009 10:42:01 +0000 (+0100)
Subject: Merge branch 'for-2.6.31' into for-2.6.32
X-Git-Tag: firefly_0821_release~12446^2~83^2~22
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=b9b5cc26d0b3a9b361cc56c3a3b0d6f819b9195f;p=firefly-linux-kernel-4.4.55.git

Merge branch 'for-2.6.31' into for-2.6.32
---

b9b5cc26d0b3a9b361cc56c3a3b0d6f819b9195f