Merge remote-tracking branches 'asoc/topic/nau8810', 'asoc/topic/of-bool', 'asoc...

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

diff --cc sound/soc/codecs/ab8500-codec.c
Simple merge

diff --cc sound/soc/qcom/lpass-platform.c
Simple merge

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