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)
commit357635ae0133ae66c4eac5b9ad4879b15faa5be8
treeff0c87bc2f627308eef88db932f6fedf48c3146d
parent11dd60447e3b1018f9cae66737cb902b519d3454
parent3fe0607a04ed7deea7c048052fd63b8670e7a176
Merge branch 'fix/intel' of git://git./linux/kernel/git/broonie/sound into asoc-intel
sound/soc/intel/sst-haswell-dsp.c
sound/soc/intel/sst-haswell-ipc.c