Merge branch 'for-3.1' into for-3.2
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 10 Aug 2011 05:11:48 +0000 (14:11 +0900)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 10 Aug 2011 05:11:48 +0000 (14:11 +0900)

Trivial merge