]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Merge remote-tracking branch 'asoc/topic/twl4030' into asoc-next
authorMark Brown <broonie@linaro.org>
Fri, 8 Nov 2013 10:43:40 +0000 (10:43 +0000)
committerMark Brown <broonie@linaro.org>
Fri, 8 Nov 2013 10:43:40 +0000 (10:43 +0000)
1  2 
include/sound/soc.h
sound/soc/soc-dapm.c

Simple merge
Simple merge