Merge branch 'for-3.1' into for-3.2
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 24 Aug 2011 09:39:09 +0000 (10:39 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 24 Aug 2011 09:39:09 +0000 (10:39 +0100)

Trivial merge