Merge branch 'for-3.2' into for-3.3
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 22 Dec 2011 12:02:29 +0000 (12:02 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 22 Dec 2011 12:02:29 +0000 (12:02 +0000)

Trivial merge