Merge branch 'for-3.2' into for-3.3
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 14 Nov 2011 21:33:17 +0000 (21:33 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 14 Nov 2011 21:33:17 +0000 (21:33 +0000)

Trivial merge