]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Merge remote-tracking branch 'asoc/topic/component' into asoc-next
authorMark Brown <broonie@linaro.org>
Wed, 21 May 2014 23:23:41 +0000 (00:23 +0100)
committerMark Brown <broonie@linaro.org>
Wed, 21 May 2014 23:23:41 +0000 (00:23 +0100)
1  2 
sound/soc/codecs/max98090.c
sound/soc/codecs/wm8962.c
sound/soc/intel/sst-haswell-pcm.c
sound/soc/soc-dapm.c

Simple merge
Simple merge
Simple merge
Simple merge