From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Thu, 7 Oct 2010 20:44:20 +0000 (-0700)
Subject: Merge branch 'for-2.6.36' into for-2.6.37
X-Git-Tag: firefly_0821_release~3680^2~2691^2~1226^2~361
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=9d9641ec891a53ef93a8972c7913605aeb8127c7;p=firefly-linux-kernel-4.4.55.git

Merge branch 'for-2.6.36' into for-2.6.37
---

9d9641ec891a53ef93a8972c7913605aeb8127c7