Merge branch 'for-2.6.33' into for-2.6.34
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Fri, 18 Dec 2009 13:31:40 +0000 (13:31 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Fri, 18 Dec 2009 13:31:40 +0000 (13:31 +0000)

Trivial merge