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)
commit5b87d31309938a49f57493ba86c765afdd4f2ffe
tree62ccc3ab8b6ea30cad90f5cd63413e7a9f3eb534
parent6be1f475e0ed2b4f9cd9c157d06e65178f4e84bb
parent014fd22ef9c6a7e9536b7e16635714a1a34810a8
Merge branch 'topic/fsl' of git://git./linux/kernel/git/broonie/sound into asoc-fsl-esai
sound/soc/fsl/Kconfig
sound/soc/fsl/fsl_esai.c