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

]> 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	dac1402be8a181dfb524fb4db1b4fd745051ba0c
tree	cbb60d38560b6880ecea9bfc3460ecd80220d8fb	tree \| snapshot
parent	d592aff7f410c99f880ed9237114045f3c0ad29f	commit \| diff
parent	c24144624a7981880899b8faa9476794d8c862ba	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