Merge branch 'for-3.1' into for-3.2
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 18 Aug 2011 16:20:36 +0000 (01:20 +0900)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 18 Aug 2011 16:20:36 +0000 (01:20 +0900)

Trivial merge