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

Trivial merge