Merge branch 'for-2.6.39' into for-2.6.40
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Sat, 26 Mar 2011 17:25:22 +0000 (17:25 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Sat, 26 Mar 2011 17:25:22 +0000 (17:25 +0000)

Trivial merge