Merge branch 'topic/jack' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...

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

diff --cc sound/soc/generic/simple-card.c
Simple merge

diff --cc sound/soc/intel/broadwell.c
Simple merge

diff --cc sound/soc/intel/cht_bsw_rt5645.c
Simple merge