From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Thu, 9 Jun 2011 11:02:26 +0000 (+0100)
Subject: Merge branch 'for-3.0' into for-3.1
X-Git-Tag: v3.1-rc1~271^2~2^2~77
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=bf564ea99797f6e66796d0d0a24a8fe872d5f26e;p=users%2Fhch%2Fblock.git

Merge branch 'for-3.0' into for-3.1
---

bf564ea99797f6e66796d0d0a24a8fe872d5f26e