From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Tue, 20 Sep 2011 11:59:35 +0000 (+0100)
Subject: Merge branch 'for-3.1' into for-3.2
X-Git-Tag: v3.3-rc1~14^2~713
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=f648de832dbf6d1947ce5a7c0ed24a3a71d8545b;p=linux-platform-drivers-x86.git

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

f648de832dbf6d1947ce5a7c0ed24a3a71d8545b