From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Mon, 27 Apr 2009 19:47:35 +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~61
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=2625240d0732ac259591ed54371bc01e7bbfdd14;p=linux.git

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

2625240d0732ac259591ed54371bc01e7bbfdd14