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)
1  2 
sound/soc/intel/sst-haswell-dsp.c
sound/soc/intel/sst-haswell-ipc.c

Simple merge
Simple merge