Merge remote-tracking branches 'asoc/topic/intel', 'asoc/topic/kirkwood', 'asoc/topic...
authorMark Brown <broonie@kernel.org>
Sun, 30 Aug 2015 14:54:38 +0000 (15:54 +0100)
committerMark Brown <broonie@kernel.org>
Sun, 30 Aug 2015 14:54:38 +0000 (15:54 +0100)

Trivial merge