Merge remote-tracking branches 'asoc/topic/codec-mutex', 'asoc/topic/compress' and...

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

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

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