Merge branch 'for-2.6.31' into for-2.6.32
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 13 Jul 2009 22:05:51 +0000 (23:05 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 13 Jul 2009 22:05:51 +0000 (23:05 +0100)

Trivial merge