Merge branch 'topic/fsl' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
authorMark Brown <broonie@kernel.org>
Mon, 1 Sep 2014 09:49:32 +0000 (10:49 +0100)
committerMark Brown <broonie@kernel.org>
Mon, 1 Sep 2014 09:49:32 +0000 (10:49 +0100)
1  2 
sound/soc/fsl/Kconfig
sound/soc/fsl/fsl_esai.c

Simple merge
Simple merge