Merge branch 'for-2.6.31' into for-2.6.32
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Fri, 7 Aug 2009 10:42:01 +0000 (11:42 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Fri, 7 Aug 2009 10:42:01 +0000 (11:42 +0100)

Trivial merge