git.kernelconcepts.de Git - karo-tx-linux.git/commit

]> git.kernelconcepts.de Git - karo-tx-linux.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	8a5b69017e1923ce467c6e0c6231e0882f4afe56
tree	cbb60d38560b6880ecea9bfc3460ecd80220d8fb	tree \| snapshot
parent	e948262ad01fc683d893abe10d1161231b2a6457	commit \| diff
parent	5c2b06369dafd796ebb4f17dab543d3da500245e	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 for KaRo TX COM modules

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