Merge branch 'for-2.6.37' into for-2.6.38
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 28 Dec 2010 23:42:53 +0000 (23:42 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 28 Dec 2010 23:42:53 +0000 (23:42 +0000)

Trivial merge