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

Trivial merge