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

Trivial merge