Merge branch 'for-2.6.33' into for-2.6.34
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Fri, 29 Jan 2010 14:31:06 +0000 (14:31 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Fri, 29 Jan 2010 14:31:06 +0000 (14:31 +0000)

Trivial merge