Merge branch 'for-2.6.38' into for-2.6.39
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 1 Mar 2011 23:29:04 +0000 (23:29 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 1 Mar 2011 23:29:04 +0000 (23:29 +0000)

Trivial merge