From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Fri, 4 Dec 2009 10:50:02 +0000 (+0000)
Subject: Merge branch 'for-2.6.33' into for-2.6.34
X-Git-Tag: v2.6.35-rc6~9^2~7^2~261
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=f1608cca9dd80231004e468b57a7a8eef80a9cd7;p=users%2Fjedix%2Flinux-maple.git

Merge branch 'for-2.6.33' into for-2.6.34
---

f1608cca9dd80231004e468b57a7a8eef80a9cd7