Merge branch 'acpi-gpio' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...

diff --cc sound/soc/intel/boards/kbl_rt5663_max98927.c
Simple merge

diff --cc sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c
Simple merge

diff --cc sound/soc/intel/skylake/skl-nhlt.c
Simple merge

diff --cc sound/soc/intel/skylake/skl-topology.c
Simple merge