Merge branch 'for-2.6.37' into for-2.6.38
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Sat, 6 Nov 2010 15:35:44 +0000 (11:35 -0400)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Sat, 6 Nov 2010 15:35:44 +0000 (11:35 -0400)

Trivial merge