Merge branch 'for-3.0' into for-3.1
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Sat, 9 Jul 2011 10:06:33 +0000 (19:06 +0900)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Sat, 9 Jul 2011 10:06:33 +0000 (19:06 +0900)

Trivial merge