Merge branch 'for-3.1' into for-3.2
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Fri, 23 Sep 2011 10:52:09 +0000 (11:52 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Fri, 23 Sep 2011 10:52:09 +0000 (11:52 +0100)

Trivial merge