Merge branch 'for-3.5' into for-3.6
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 23 Jul 2012 09:45:07 +0000 (10:45 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 23 Jul 2012 09:45:07 +0000 (10:45 +0100)

Trivial merge