author | Mark Brown <broonie@kernel.org> | |
Fri, 4 Nov 2016 18:33:45 +0000 (12:33 -0600) | ||
committer | Mark Brown <broonie@kernel.org> | |
Fri, 4 Nov 2016 18:33:45 +0000 (12:33 -0600) |
diff --cc sound/soc/intel/Kconfig
Simple merge
diff --cc sound/soc/intel/atom/sst/sst_acpi.c
Simple merge
Simple merge
diff --cc sound/soc/intel/skylake/skl.c
Simple merge