Merge branch 'for-2.6.30' into for-2.6.31
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Fri, 15 May 2009 07:59:52 +0000 (08:59 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Fri, 15 May 2009 07:59:52 +0000 (08:59 +0100)

Trivial merge