Merge remote-tracking branch 'asoc/topic/fsl-esai' into asoc-next
authorMark Brown <broonie@kernel.org>
Mon, 8 Dec 2014 13:11:45 +0000 (13:11 +0000)
committerMark Brown <broonie@kernel.org>
Mon, 8 Dec 2014 13:11:45 +0000 (13:11 +0000)

Trivial merge