Merge branch 'for-linus' into for-next

diff --cc sound/soc/au1x/db1200.c
Simple merge

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

diff --cc sound/soc/codecs/rt5645.h
Simple merge

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