Merge remote-tracking branch 'regulator/topic/tps80031' into v3.9-rc8
authorMark Brown <broonie@sirena.org.uk>
Sun, 28 Apr 2013 01:13:48 +0000 (02:13 +0100)
committerMark Brown <broonie@sirena.org.uk>
Sun, 28 Apr 2013 01:13:48 +0000 (02:13 +0100)

Trivial merge