Merge branch 'for-2.6.31' into for-2.6.32
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 23 Jul 2009 07:22:58 +0000 (08:22 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 23 Jul 2009 07:22:58 +0000 (08:22 +0100)

Trivial merge