Merge branch 'for-2.6.30' into for-2.6.31
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 12 May 2009 09:53:33 +0000 (10:53 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 12 May 2009 09:53:33 +0000 (10:53 +0100)

Trivial merge