Merge branch 'fix/fsl-esai' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
authorMark Brown <broonie@linaro.org>
Sat, 16 Aug 2014 22:22:36 +0000 (17:22 -0500)
committerMark Brown <broonie@linaro.org>
Sat, 16 Aug 2014 22:22:36 +0000 (17:22 -0500)
1  2 
sound/soc/fsl/fsl_esai.c

Simple merge