Merge remote-tracking branch 'asoc/fix/intel' into asoc-linus
authorMark Brown <broonie@kernel.org>
Sun, 12 Apr 2015 18:48:20 +0000 (19:48 +0100)
committerMark Brown <broonie@kernel.org>
Sun, 12 Apr 2015 18:48:20 +0000 (19:48 +0100)
1  2 
sound/soc/intel/sst-firmware.c
sound/soc/intel/sst/sst_acpi.c

Simple merge
Simple merge