Merge remote-tracking branch 'asoc/fix/fsl-esai' into asoc-linus
authorMark Brown <broonie@kernel.org>
Mon, 26 Jan 2015 11:29:54 +0000 (11:29 +0000)
committerMark Brown <broonie@kernel.org>
Mon, 26 Jan 2015 11:29:54 +0000 (11:29 +0000)

Trivial merge