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

Trivial merge