Merge remote-tracking branch 'regulator/fix/tps80031' into tmp
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 29 Jan 2013 03:14:35 +0000 (11:14 +0800)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 29 Jan 2013 03:14:35 +0000 (11:14 +0800)

Trivial merge