From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Fri, 15 May 2009 07:59:52 +0000 (+0100)
Subject: Merge branch 'for-2.6.30' into for-2.6.31
X-Git-Tag: v2.6.33-rc3~4^2~198^2~32^2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=81a4275bff16b0a63074669541be6eb4d5279f26;p=users%2Fjedix%2Flinux-maple.git

Merge branch 'for-2.6.30' into for-2.6.31
---

81a4275bff16b0a63074669541be6eb4d5279f26