Merge remote-tracking branches 'asoc/topic/fsl', 'asoc/topic/hdmi', 'asoc/topic/hisi...
authorMark Brown <[email protected]>
Mon, 3 Jul 2017 15:15:11 +0000 (16:15 +0100)
committerMark Brown <[email protected]>
Mon, 3 Jul 2017 15:15:11 +0000 (16:15 +0100)

Trivial merge