Merge branch 'for-3.0' into for-3.1
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 4 Jul 2011 15:54:40 +0000 (08:54 -0700)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 4 Jul 2011 15:54:40 +0000 (08:54 -0700)

Trivial merge