Merge branch 'for-2.6.38' into for-2.6.39
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Fri, 25 Feb 2011 11:45:09 +0000 (11:45 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Fri, 25 Feb 2011 11:45:09 +0000 (11:45 +0000)

Trivial merge