From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Mon, 22 Aug 2011 13:00:08 +0000 (+0100)
Subject: Merge branch 'for-3.1' into for-3.2
X-Git-Tag: v3.3-rc1~14^2~788
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=fef24d92a649ba1415c0a834259048153a2ab30a;p=users%2Fhch%2Fblock.git

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

fef24d92a649ba1415c0a834259048153a2ab30a