Merge branch 'for-2.6.31' into for-2.6.32
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 25 Jun 2009 12:58:37 +0000 (13:58 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 25 Jun 2009 12:58:37 +0000 (13:58 +0100)

Trivial merge