Merge remote-tracking branches 'asoc/fix/cs4265', 'asoc/fix/intel' and 'asoc/fix...
authorMark Brown <[email protected]>
Thu, 6 Aug 2015 11:39:07 +0000 (12:39 +0100)
committerMark Brown <[email protected]>
Thu, 6 Aug 2015 11:39:07 +0000 (12:39 +0100)

Trivial merge