Merge branch 'for-2.6.38' into for-2.6.39
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 19 Jan 2011 11:22:54 +0000 (11:22 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 19 Jan 2011 11:22:54 +0000 (11:22 +0000)

Trivial merge