From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Wed, 13 Apr 2011 17:37:18 +0000 (-0700)
Subject: Merge branch 'for-2.6.39' into for-2.6.40
X-Git-Tag: v3.0-rc1~347^2~1^2~69
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=f030d60b30855e18ac5bf080fa9e576147623d18;p=users%2Fhch%2Fmisc.git

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

f030d60b30855e18ac5bf080fa9e576147623d18