Merge branch 'for-3.2' into for-3.3
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 22 Nov 2011 19:40:47 +0000 (19:40 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 22 Nov 2011 19:40:47 +0000 (19:40 +0000)

Trivial merge