Merge remote-tracking branches 'regulator/topic/cpcap', 'regulator/topic/fan53555...
authorMark Brown <broonie@kernel.org>
Sun, 19 Feb 2017 16:40:28 +0000 (16:40 +0000)
committerMark Brown <broonie@kernel.org>
Sun, 19 Feb 2017 16:40:28 +0000 (16:40 +0000)

Trivial merge