Merge branch 'for-2.6.37' into for-2.6.38
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 11 Nov 2010 16:00:49 +0000 (16:00 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 11 Nov 2010 16:00:49 +0000 (16:00 +0000)

Trivial merge