Merge remote-tracking branches 'asoc/topic/sirf-audio', 'asoc/topic/sn95031', 'asoc...
authorMark Brown <broonie@kernel.org>
Wed, 28 Mar 2018 02:30:40 +0000 (10:30 +0800)
committerMark Brown <broonie@kernel.org>
Wed, 28 Mar 2018 02:30:40 +0000 (10:30 +0800)
1  2  3  4  5  6 
sound/soc/codecs/Makefile
sound/soc/soc-dapm.c

Simple merge
Simple merge