Merge branch 'for-2.6.38' into for-2.6.39
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 25 Jan 2011 15:19:29 +0000 (15:19 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 25 Jan 2011 15:19:29 +0000 (15:19 +0000)

Trivial merge