Merge branch 'for-2.6.39' into for-2.6.40
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 6 Apr 2011 23:27:06 +0000 (08:27 +0900)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 6 Apr 2011 23:27:06 +0000 (08:27 +0900)

Trivial merge