Merge branch 'for-3.1' into for-3.2
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Sun, 14 Aug 2011 10:24:40 +0000 (19:24 +0900)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Sun, 14 Aug 2011 10:24:40 +0000 (19:24 +0900)

Trivial merge