Merge branch 'for-3.1' into for-3.2
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 22 Aug 2011 22:33:01 +0000 (23:33 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 22 Aug 2011 22:33:01 +0000 (23:33 +0100)

Trivial merge