Merge branch 'for-3.2' into for-3.3
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 7 Dec 2011 16:15:39 +0000 (00:15 +0800)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 7 Dec 2011 16:15:39 +0000 (00:15 +0800)

Trivial merge