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

author Mark Brown <[email protected]>

Wed, 11 Mar 2015 12:53:41 +0000 (12:53 +0000)

committer Mark Brown <[email protected]>

Wed, 11 Mar 2015 12:53:41 +0000 (12:53 +0000)
author Mark Brown <[email protected]>
Wed, 11 Mar 2015 12:53:41 +0000 (12:53 +0000)
committer Mark Brown <[email protected]>
Wed, 11 Mar 2015 12:53:41 +0000 (12:53 +0000)
diff --cc sound/soc/intel/sst-haswell-dsp.c
Simple merge
diff --cc sound/soc/intel/sst-haswell-ipc.c
Simple merge
author	Mark Brown <[email protected]>
	Wed, 11 Mar 2015 12:53:41 +0000 (12:53 +0000)
committer	Mark Brown <[email protected]>
	Wed, 11 Mar 2015 12:53:41 +0000 (12:53 +0000)
		1	2
sound/soc/intel/sst-haswell-dsp.c	patch \|	diff1 \|	diff2 \|	blob \| history
sound/soc/intel/sst-haswell-ipc.c	patch \|	diff1 \|	diff2 \|	blob \| history