Merge branch 'for-2.6.32' into for-2.6.33
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Fri, 18 Sep 2009 14:09:44 +0000 (15:09 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Fri, 18 Sep 2009 14:09:44 +0000 (15:09 +0100)

Trivial merge