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