Merge branch 'for-2.6.39' into for-2.6.40
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Sun, 8 May 2011 14:33:41 +0000 (15:33 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Sun, 8 May 2011 14:33:41 +0000 (15:33 +0100)

Trivial merge