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

author Mark Brown <[email protected]>

Sun, 12 Apr 2015 18:48:20 +0000 (19:48 +0100)

committer Mark Brown <[email protected]>

Sun, 12 Apr 2015 18:48:20 +0000 (19:48 +0100)
author Mark Brown <[email protected]>
Sun, 12 Apr 2015 18:48:20 +0000 (19:48 +0100)
committer Mark Brown <[email protected]>
Sun, 12 Apr 2015 18:48:20 +0000 (19:48 +0100)
diff --cc sound/soc/intel/sst-firmware.c
Simple merge
diff --cc sound/soc/intel/sst/sst_acpi.c
Simple merge
author	Mark Brown <[email protected]>
	Sun, 12 Apr 2015 18:48:20 +0000 (19:48 +0100)
committer	Mark Brown <[email protected]>
	Sun, 12 Apr 2015 18:48:20 +0000 (19:48 +0100)
		1	2
sound/soc/intel/sst-firmware.c	patch \|	diff1 \|	diff2 \|	blob \| history
sound/soc/intel/sst/sst_acpi.c	patch \|	diff1 \|	diff2 \|	blob \| history