Merge branch 'for-3.1' into for-3.2
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Fri, 12 Aug 2011 02:48:29 +0000 (11:48 +0900)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Fri, 12 Aug 2011 02:48:29 +0000 (11:48 +0900)

Trivial merge