Merge branch 'for-2.6.39' into for-2.6.40
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 28 Apr 2011 11:10:25 +0000 (12:10 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 28 Apr 2011 11:10:25 +0000 (12:10 +0100)

Trivial merge