Merge branch 'for-3.0' into for-3.1
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 7 Jul 2011 16:54:19 +0000 (09:54 -0700)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 7 Jul 2011 16:54:19 +0000 (09:54 -0700)

Trivial merge