Merge branch 'fix/intel' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
authorMark Brown <broonie@kernel.org>
Wed, 11 Mar 2015 12:53:41 +0000 (12:53 +0000)
committerMark Brown <broonie@kernel.org>
Wed, 11 Mar 2015 12:53:41 +0000 (12:53 +0000)
1  2 
sound/soc/intel/sst-haswell-dsp.c
sound/soc/intel/sst-haswell-ipc.c

Simple merge
Simple merge