Merge branch 'for-2.6.38' into for-2.6.39
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 3 Mar 2011 11:13:15 +0000 (11:13 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 3 Mar 2011 11:13:15 +0000 (11:13 +0000)

Trivial merge