Merge branch 'for-2.6.32' into for-2.6.33
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Fri, 6 Nov 2009 15:46:18 +0000 (15:46 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Fri, 6 Nov 2009 15:46:18 +0000 (15:46 +0000)

Trivial merge