Merge remote branch 'broonie-asoc/for-2.6.37' into for-2.6.37
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Fri, 27 Aug 2010 10:22:57 +0000 (11:22 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Fri, 27 Aug 2010 10:22:57 +0000 (11:22 +0100)

Trivial merge