Merge branches 'topic/owner' and 'topic/reg-default' of git://git.kernel.org/pub...

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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