Merge branch 'for-2.6.39' into for-2.6.40
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 26 Apr 2011 10:46:47 +0000 (11:46 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 26 Apr 2011 10:46:47 +0000 (11:46 +0100)

Trivial merge