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)
commita55ede1661268c1a6fe94078b7b08906dfa7b77a
treefe46be595fc52803a74b3e081a01ec247eb5ac1c
parentdad0e523ede5a6d2d20c54d0e179b36a54a9953b
parent6212755eff3171e0211bb6a9f4706e115217588c
Merge remote-tracking branch 'asoc/fix/intel' into asoc-linus
sound/soc/intel/sst-firmware.c
sound/soc/intel/sst/sst_acpi.c