Merge branch 'for-2.6.37' into for-2.6.38
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 29 Nov 2010 18:33:47 +0000 (18:33 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 29 Nov 2010 18:33:47 +0000 (18:33 +0000)

Trivial merge