Merge branch 'for-2.6.39' into for-2.6.40
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 13 Apr 2011 17:33:52 +0000 (10:33 -0700)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 13 Apr 2011 17:33:52 +0000 (10:33 -0700)

Trivial merge