Merge branch 'for-2.6.33' into for-2.6.34
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 12 Jan 2010 12:59:05 +0000 (12:59 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 12 Jan 2010 12:59:05 +0000 (12:59 +0000)

Trivial merge