Merge branch 'for-2.6.32' into for-2.6.33
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 1 Oct 2009 10:35:11 +0000 (11:35 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 1 Oct 2009 10:35:11 +0000 (11:35 +0100)

Trivial merge