Merge branch 'for-2.6.39' into for-2.6.40
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 3 May 2011 22:30:36 +0000 (23:30 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 3 May 2011 22:30:36 +0000 (23:30 +0100)

Trivial merge