Merge remote-tracking branches 'asoc/fix/arizona', 'asoc/fix/fsl', 'asoc/fix/fsl...

author Mark Brown <broonie@linaro.org>

Fri, 15 Aug 2014 11:51:29 +0000 (12:51 +0100)

committer Mark Brown <broonie@linaro.org>

Fri, 15 Aug 2014 11:51:29 +0000 (12:51 +0100)
author Mark Brown <broonie@linaro.org>
Fri, 15 Aug 2014 11:51:29 +0000 (12:51 +0100)
committer Mark Brown <broonie@linaro.org>
Fri, 15 Aug 2014 11:51:29 +0000 (12:51 +0100)
diff --cc sound/soc/intel/sst-baytrail-ipc.c
Simple merge
author	Mark Brown <broonie@linaro.org>
	Fri, 15 Aug 2014 11:51:29 +0000 (12:51 +0100)
committer	Mark Brown <broonie@linaro.org>
	Fri, 15 Aug 2014 11:51:29 +0000 (12:51 +0100)