Merge branch 'for-2.6.30' into for-2.6.31
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 23 Apr 2009 15:09:52 +0000 (16:09 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 23 Apr 2009 15:09:52 +0000 (16:09 +0100)

Trivial merge