From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Thu, 13 Jan 2011 13:58:23 +0000 (+0000)
Subject: Merge branch 'for-2.6.38' into for-2.6.39
X-Git-Tag: v2.6.39-rc1~200^2^2~194
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=3e8e2cc45c9d6b5c1265838a8cff701815321dbc;p=users%2Fjedix%2Flinux-maple.git

Merge branch 'for-2.6.38' into for-2.6.39
---

3e8e2cc45c9d6b5c1265838a8cff701815321dbc