Merge branch 'for-2.6.38' into for-2.6.39
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Fri, 21 Jan 2011 18:30:55 +0000 (18:30 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Fri, 21 Jan 2011 18:30:55 +0000 (18:30 +0000)

Trivial merge