Merge remote-tracking branches 'asoc/fix/ak4642', 'asoc/fix/ep93xx', 'asoc/fix/kirkwo...
authorMark Brown <broonie@kernel.org>
Wed, 25 May 2016 18:18:00 +0000 (19:18 +0100)
committerMark Brown <broonie@kernel.org>
Wed, 25 May 2016 18:18:00 +0000 (19:18 +0100)

Trivial merge