From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Fri, 21 Jan 2011 18:30:55 +0000 (+0000)
Subject: Merge branch 'for-2.6.38' into for-2.6.39
X-Git-Tag: v2.6.39-rc1~200^2^2~166
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=477adb06bf1638a4f108d155431ec0dd1ff8ba88;p=users%2Fhch%2Fmisc.git

Merge branch 'for-2.6.38' into for-2.6.39
---

477adb06bf1638a4f108d155431ec0dd1ff8ba88