]> git.proxmox.com Git - mirror_ubuntu-focal-kernel.git/commitdiff
Merge remote-tracking branches 'asoc/topic/stm32', 'asoc/topic/sun4i-i2s', 'asoc...
authorMark Brown <broonie@kernel.org>
Thu, 18 Jan 2018 11:56:17 +0000 (11:56 +0000)
committerMark Brown <broonie@kernel.org>
Thu, 18 Jan 2018 11:56:17 +0000 (11:56 +0000)
1  2  3  4  5  6 
include/sound/soc-dai.h
sound/soc/sunxi/sun4i-i2s.c

Simple merge
Simple merge