Merge branch 'for-2.6.37' into for-2.6.38
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Fri, 3 Dec 2010 17:28:29 +0000 (17:28 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Fri, 3 Dec 2010 17:28:29 +0000 (17:28 +0000)

Trivial merge