Merge branch 'for-2.6.37' into HEAD
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Fri, 5 Nov 2010 13:16:07 +0000 (09:16 -0400)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Fri, 5 Nov 2010 13:16:07 +0000 (09:16 -0400)

Trivial merge