From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Wed, 17 Aug 2011 07:34:05 +0000 (+0900)
Subject: Merge branch 'for-3.1' into for-3.2
X-Git-Tag: v3.3-rc1~14^2~797
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=3d3106433e779cd6d5e4814eaeaec6b79a8ddd53;p=users%2Fjedix%2Flinux-maple.git

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

3d3106433e779cd6d5e4814eaeaec6b79a8ddd53