Merge branch 'for-3.1' into for-3.2
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 6 Sep 2011 01:13:31 +0000 (18:13 -0700)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 6 Sep 2011 01:13:31 +0000 (18:13 -0700)

Trivial merge