]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
Merge remote-tracking branch 'asoc/topic/tlv320aic3x' into asoc-next
authorMark Brown <broonie@linaro.org>
Thu, 24 Oct 2013 10:24:16 +0000 (11:24 +0100)
committerMark Brown <broonie@linaro.org>
Thu, 24 Oct 2013 10:24:16 +0000 (11:24 +0100)
1  2 
sound/soc/codecs/tlv320aic3x.c

Simple merge