Merge remote-tracking branches 'asoc/topic/intel' and 'asoc/topic/max98090' into...
authorMark Brown <broonie@kernel.org>
Mon, 22 Jun 2015 09:24:30 +0000 (10:24 +0100)
committerMark Brown <broonie@kernel.org>
Mon, 22 Jun 2015 09:24:30 +0000 (10:24 +0100)

Trivial merge