Merge remote-tracking branches 'asoc/topic/ak4613', 'asoc/topic/ak4642', 'asoc/topic...
authorMark Brown <broonie@kernel.org>
Wed, 23 Sep 2015 18:01:16 +0000 (11:01 -0700)
committerMark Brown <broonie@kernel.org>
Wed, 23 Sep 2015 18:01:16 +0000 (11:01 -0700)

Trivial merge