Merge branch 'for-2.6.38' into for-2.6.39
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Sun, 13 Feb 2011 19:51:04 +0000 (19:51 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Sun, 13 Feb 2011 19:51:04 +0000 (19:51 +0000)

Trivial merge