Merge remote-tracking branch 'asoc/fix/intel' into asoc-linus
authorMark Brown <broonie@kernel.org>
Mon, 16 Mar 2015 12:03:14 +0000 (12:03 +0000)
committerMark Brown <broonie@kernel.org>
Mon, 16 Mar 2015 12:03:14 +0000 (12:03 +0000)
commit016e81f2029cd89fcf71bd6324cb0eda9c56ec5d
tree6410d0b2b9efe50d8bfd462f66406442f034edde
parent06e5801b8cb3fc057d88cb4dc03c0b64b2744cda
parent3fe0607a04ed7deea7c048052fd63b8670e7a176
Merge remote-tracking branch 'asoc/fix/intel' into asoc-linus
sound/soc/intel/sst-haswell-dsp.c
sound/soc/intel/sst-haswell-ipc.c