Merge remote-tracking branches 'asoc/topic/rt5651', 'asoc/topic/samsung', 'asoc/topic...

diff --cc include/sound/soc.h
Simple merge

diff --cc sound/soc/codecs/sgtl5000.c
Simple merge

diff --cc sound/soc/codecs/tlv320dac33.c
Simple merge

diff --cc sound/soc/samsung/Kconfig
Simple merge

diff --cc sound/soc/soc-core.c
Simple merge