Merge branch 'for-3.1' into for-3.2
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 9 Aug 2011 15:18:10 +0000 (00:18 +0900)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 9 Aug 2011 15:18:10 +0000 (00:18 +0900)

Trivial merge