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

Trivial merge