Merge branch 'for-3.1' into for-3.2
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 15 Sep 2011 23:54:25 +0000 (00:54 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 15 Sep 2011 23:54:25 +0000 (00:54 +0100)

Trivial merge