git.baikalelectronics.ru Git - kernel.git/commit

author	Mark Brown <broonie@kernel.org>
	Thu, 5 Feb 2015 20:18:39 +0000 (20:18 +0000)
committer	Mark Brown <broonie@kernel.org>
	Thu, 5 Feb 2015 20:18:39 +0000 (20:18 +0000)
commit	87e1ffa67a938d8db6134d6301e6e005f77ca59d
tree	cbb60d38560b6880ecea9bfc3460ecd80220d8fb	tree \| snapshot
parent	191b73f11d7c0e412dd22fd6bc69f12f7b8d8220	commit \| diff
parent	cc3097db5b14dfb0825270f1f81e7485cbcb1fc8	commit \| diff

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

Conflicts:
sound/soc/intel/sst/sst_acpi.c

Linux Kernel Source Tree.

sound/soc/intel/Kconfig	diff1 \|	diff2 \|	blob \| history
sound/soc/intel/bytcr_dpcm_rt5640.c	diff1 \|	diff2 \|	blob \| history
sound/soc/intel/sst-firmware.c	diff1 \|	diff2 \|	blob \| history
sound/soc/intel/sst-haswell-ipc.c	diff1 \|	diff2 \|	blob \| history