Merge branch 'for-2.6.37' into for-2.6.38
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 30 Nov 2010 11:35:43 +0000 (11:35 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 30 Nov 2010 11:35:43 +0000 (11:35 +0000)

Trivial merge