Merge remote-tracking branches 'regulator/topic/act8865', 'regulator/topic/can-change...
authorMark Brown <broonie@kernel.org>
Wed, 20 Jul 2016 17:02:01 +0000 (18:02 +0100)
committerMark Brown <broonie@kernel.org>
Wed, 20 Jul 2016 17:02:01 +0000 (18:02 +0100)

Trivial merge