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

Trivial merge