Merge branch 'for-2.6.34' into for-2.6.35
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 29 Mar 2010 20:03:20 +0000 (21:03 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 29 Mar 2010 20:03:20 +0000 (21:03 +0100)

Trivial merge