Merge branch 'fix/intel' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
authorMark Brown <broonie@kernel.org>
Tue, 31 Jan 2017 20:03:10 +0000 (20:03 +0000)
committerMark 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
sound/soc/intel/boards/bytcr_rt5640.c

Simple merge