]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'topic/tlv320aic23' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorMark Brown <broonie@linaro.org>
Fri, 7 Mar 2014 03:05:07 +0000 (11:05 +0800)
committerMark Brown <broonie@linaro.org>
Fri, 7 Mar 2014 03:05:07 +0000 (11:05 +0800)
commit38911e77ae2bc1ee04f8f68f4e3eb39519b66daa
tree202ff8185e6aa7fbb7993d1c9b417c04b7d3234b
parentd4cfef773da208c8802f62f0ce08731b28eb49ef
parent3c9ec3c324af1e0e2e2a0a3a052022f216d699b2
Merge branch 'topic/tlv320aic23' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-fsl

Conflicts:
sound/soc/fsl/Kconfig
sound/soc/fsl/Kconfig