From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Mon, 6 Jun 2011 18:34:58 +0000 (+0100)
Subject: Merge branch 'for-3.0' into for-3.1
X-Git-Tag: v3.1-rc1~87^2^2~120
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=bd4f2acb8dfbff473f1abe805bca902720f653b4;p=linux-block.git

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

bd4f2acb8dfbff473f1abe805bca902720f653b4