From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Tue, 3 May 2011 18:07:45 +0000 (+0100)
Subject: Merge branch 'for-2.6.39' into for-2.6.40
X-Git-Tag: v3.0-rc1~347^2~1^2~27^2~21
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=65f7e32520fcc31c32d72e61198a4eb457656860;p=users%2Fjedix%2Flinux-maple.git

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

65f7e32520fcc31c32d72e61198a4eb457656860