]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitbf25310cd2a8f01ad52b05d66cce9a9e2349ecf5
tree8b40cf912a942771b0b22f2aa0ac20d5af256010
parent19bc333a1dbc56dfeaedc611a639f516df7f86c8
parent1044043f5f0b0410ef9d323a74ccd54b7920981b
Merge branch 'fix/intel' of git://git.kernel.org/pub/scm/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