Merge branch 'for-2.6.30' into for-2.6.31
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 20 Apr 2009 11:45:40 +0000 (12:45 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 20 Apr 2009 11:45:40 +0000 (12:45 +0100)

Trivial merge