Merge branch 'for-3.2' into for-3.3
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 29 Nov 2011 12:00:17 +0000 (12:00 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 29 Nov 2011 12:00:17 +0000 (12:00 +0000)

Trivial merge