Merge branch 'for-3.2' into for-3.3
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 17 Nov 2011 16:48:57 +0000 (16:48 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 17 Nov 2011 16:48:57 +0000 (16:48 +0000)

Trivial merge