Merge branch 'for-2.6.34' into for-2.6.35
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 22 Mar 2010 17:23:46 +0000 (17:23 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 22 Mar 2010 17:23:46 +0000 (17:23 +0000)

Trivial merge