Merge remote-tracking branch 'regulator/fix/s2mps11' into tmp
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 6 Feb 2013 11:28:51 +0000 (11:28 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 6 Feb 2013 11:28:51 +0000 (11:28 +0000)

Trivial merge