Merge branch 'fix/intel' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...

author Mark Brown <broonie@kernel.org>

Tue, 31 Jan 2017 20:03:10 +0000 (20:03 +0000)

committer Mark Brown <broonie@kernel.org>

Tue, 31 Jan 2017 20:03:10 +0000 (20:03 +0000)
author Mark Brown <broonie@kernel.org>
Tue, 31 Jan 2017 20:03:10 +0000 (20:03 +0000)
committer Mark Brown <broonie@kernel.org>
Tue, 31 Jan 2017 20:03:10 +0000 (20:03 +0000)
diff --cc sound/soc/intel/atom/sst-atom-controls.c
Simple merge
diff --cc sound/soc/intel/boards/bytcr_rt5640.c
Simple merge
author	Mark Brown <broonie@kernel.org>
	Tue, 31 Jan 2017 20:03:10 +0000 (20:03 +0000)
committer	Mark Brown <broonie@kernel.org>
	Tue, 31 Jan 2017 20:03:10 +0000 (20:03 +0000)
		1	2
sound/soc/intel/atom/sst-atom-controls.c	patch \|	diff1 \|	diff2 \|	blob \| history
sound/soc/intel/boards/bytcr_rt5640.c	patch \|	diff1 \|	diff2 \|	blob \| history