Merge remote-tracking branches 'asoc/fix/ak4613', 'asoc/fix/arizona', 'asoc/fix/cx204...
authorMark Brown <[email protected]>
Fri, 1 Jul 2016 16:05:31 +0000 (18:05 +0200)
committerMark Brown <[email protected]>
Fri, 1 Jul 2016 16:05:31 +0000 (18:05 +0200)

Trivial merge