From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Sat, 9 Apr 2011 02:33:45 +0000 (+0900)
Subject: Merge branch 'for-2.6.39' into for-2.6.40
X-Git-Tag: v3.0-rc1~347^2~1^2~92
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=70da1dc052349b75a91fea1198258c99cea03390;p=users%2Fjedix%2Flinux-maple.git

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

70da1dc052349b75a91fea1198258c99cea03390