Merge branch 'for-3.0' into for-3.1
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 29 Jun 2011 16:49:04 +0000 (09:49 -0700)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 29 Jun 2011 16:49:04 +0000 (09:49 -0700)

Trivial merge