Merge remote-tracking branches 'regulator/topic/act8865', 'regulator/topic/arizona...
authorMark Brown <broonie@kernel.org>
Fri, 10 Apr 2015 18:16:00 +0000 (19:16 +0100)
committerMark Brown <broonie@kernel.org>
Fri, 10 Apr 2015 18:16:00 +0000 (19:16 +0100)

Trivial merge