Merge branch 'for-3.2' into for-3.3
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 23 Nov 2011 11:18:32 +0000 (11:18 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 23 Nov 2011 11:18:32 +0000 (11:18 +0000)

Trivial merge