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)
Conflicts:
sound/soc/intel/sst-baytrail-dsp.c


Trivial merge