Merge branch 'fix/intel' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
authorMark Brown <broonie@kernel.org>
Thu, 5 Feb 2015 20:18:39 +0000 (20:18 +0000)
committerMark Brown <broonie@kernel.org>
Thu, 5 Feb 2015 20:18:39 +0000 (20:18 +0000)
commit8a5b69017e1923ce467c6e0c6231e0882f4afe56
treecbb60d38560b6880ecea9bfc3460ecd80220d8fb
parente948262ad01fc683d893abe10d1161231b2a6457
parent5c2b06369dafd796ebb4f17dab543d3da500245e
Merge branch 'fix/intel' of git://git./linux/kernel/git/broonie/sound into asoc-intel

Conflicts:
sound/soc/intel/sst/sst_acpi.c
sound/soc/intel/Kconfig
sound/soc/intel/bytcr_dpcm_rt5640.c
sound/soc/intel/sst-firmware.c
sound/soc/intel/sst-haswell-ipc.c