Merge remote-tracking branch 'asoc/topic/intel' into asoc-next
authorMark Brown <broonie@kernel.org>
Sun, 12 Apr 2015 18:48:33 +0000 (19:48 +0100)
committerMark Brown <broonie@kernel.org>
Sun, 12 Apr 2015 18:48:33 +0000 (19:48 +0100)
commitaab0bb17ef2440ef5f68dcde5f1a6b32dcdfa9fb
tree6e14e997a1424e189d47ec04f4b1e1b8e6d85491
parent77b62fa5d23988155132cf7fee44f2c209e3dc4c
parenta5e5e12bd4ed5cd1123ace4300b5c07230fbf21e
Merge remote-tracking branch 'asoc/topic/intel' into asoc-next
sound/soc/intel/atom/sst/sst_acpi.c
sound/soc/intel/common/sst-acpi.c
sound/soc/intel/common/sst-dsp.h
sound/soc/intel/common/sst-firmware.c