Merge remote-tracking branch 'asoc/fix/intel' into asoc-linus

author Mark Brown <broonie@kernel.org>

Mon, 16 Mar 2015 12:03:14 +0000 (12:03 +0000)

committer Mark Brown <broonie@kernel.org>

Mon, 16 Mar 2015 12:03:14 +0000 (12:03 +0000)
author Mark Brown <broonie@kernel.org>
Mon, 16 Mar 2015 12:03:14 +0000 (12:03 +0000)
committer Mark Brown <broonie@kernel.org>
Mon, 16 Mar 2015 12:03:14 +0000 (12:03 +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 <broonie@kernel.org>
	Mon, 16 Mar 2015 12:03:14 +0000 (12:03 +0000)
committer	Mark Brown <broonie@kernel.org>
	Mon, 16 Mar 2015 12:03:14 +0000 (12:03 +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