Merge branch 'fix/intel' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
authorMark Brown <broonie@linaro.org>
Tue, 13 May 2014 17:23:56 +0000 (18:23 +0100)
committerMark Brown <broonie@linaro.org>
Tue, 13 May 2014 17:23:56 +0000 (18:23 +0100)
commit8bee1fd482622718fcc1a537db1d7ca48d7f52f8
tree8b40cf912a942771b0b22f2aa0ac20d5af256010
parentdfe1951b0c1c6a80b8ad8702eb93f8a4dffa31f1
parentcffd6665f57ed18f4be9185c4330c8c98c22e201
Merge branch 'fix/intel' of git://git./linux/kernel/git/broonie/sound into asoc-intel

Conflicts:
sound/soc/intel/sst-baytrail-dsp.c
sound/soc/intel/sst-baytrail-dsp.c
sound/soc/intel/sst-baytrail-ipc.c
sound/soc/intel/sst-dsp-priv.h
sound/soc/intel/sst-firmware.c