Merge branch 'for-3.1' into for-3.2
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 11 Aug 2011 01:43:40 +0000 (10:43 +0900)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 11 Aug 2011 01:43:40 +0000 (10:43 +0900)

Trivial merge