Merge remote-tracking branches 'regulator/fix/da9053' and 'regulator/fix/s2mps11...
authorMark Brown <broonie@kernel.org>
Wed, 20 Jul 2016 17:01:59 +0000 (18:01 +0100)
committerMark Brown <broonie@kernel.org>
Wed, 20 Jul 2016 17:01:59 +0000 (18:01 +0100)

Trivial merge