From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Sun, 17 Jul 2011 09:25:58 +0000 (+0900)
Subject: Merge branch 'for-3.0' into for-3.1
X-Git-Tag: v3.1-rc1~271^2~2^2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=440085598672c0e3fde8a48495f61fea418b06d1;p=users%2Fjedix%2Flinux-maple.git

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

440085598672c0e3fde8a48495f61fea418b06d1