From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Thu, 11 Aug 2011 03:30:26 +0000 (+0900)
Subject: Merge branch 'for-3.1' into for-3.2
X-Git-Tag: v3.3-rc1~14^2~837
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=10645a7c68fee0548e70c56eccc9eec2abab0166;p=users%2Fdwmw2%2Flinux.git

Merge branch 'for-3.1' into for-3.2
---

10645a7c68fee0548e70c56eccc9eec2abab0166