]> git.proxmox.com Git - mirror_ubuntu-zesty-kernel.git/commitdiff
Merge remote-tracking branch 'asoc/topic/dapm' into asoc-core
authorMark Brown <broonie@linaro.org>
Tue, 27 Aug 2013 14:40:47 +0000 (15:40 +0100)
committerMark Brown <broonie@linaro.org>
Tue, 27 Aug 2013 14:40:47 +0000 (15:40 +0100)
1  2 
include/sound/soc.h

Simple merge