Merge branch 'for-2.6.30' into for-2.6.31
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 27 Apr 2009 19:47:35 +0000 (20:47 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 27 Apr 2009 19:47:35 +0000 (20:47 +0100)

Trivial merge