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

Simple merge
Simple merge