Merge branch 'for-3.0' into for-3.1
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 7 Jun 2011 08:49:47 +0000 (09:49 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 7 Jun 2011 08:49:47 +0000 (09:49 +0100)

Trivial merge