From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Tue, 23 Nov 2010 14:30:41 +0000 (+0000)
Subject: Merge branch 'for-2.6.37' into for-2.6.38
X-Git-Tag: v2.6.38-rc1~236^2^2~146
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=d50a87402e29e16a63152be810d9723ce4d87e37;p=users%2Fjedix%2Flinux-maple.git

Merge branch 'for-2.6.37' into for-2.6.38
---

d50a87402e29e16a63152be810d9723ce4d87e37