Merge branch 'for-3.0' into for-3.1
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 23 Jun 2011 19:10:28 +0000 (20:10 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 23 Jun 2011 19:10:28 +0000 (20:10 +0100)

Trivial merge