Merge remote-tracking branch 'asoc/fix/intel' into asoc-linus
authorMark Brown <broonie@kernel.org>
Wed, 10 Feb 2016 19:23:02 +0000 (19:23 +0000)
committerMark Brown <broonie@kernel.org>
Wed, 10 Feb 2016 19:23:02 +0000 (19:23 +0000)
commit7ff60f58e244a4f74589f5c5af1a1f5d4db227c3
tree5d2ec00847b6be7b0ec2a92e9e47eb4d57880f7a
parent2022d24e2bc03639da2630b7299d723bf88fc487
parent38c079e230f25969e7ce3501fa967b003a2abc39
Merge remote-tracking branch 'asoc/fix/intel' into asoc-linus
sound/soc/intel/skylake/skl-pcm.c
sound/soc/intel/skylake/skl-topology.c
sound/soc/intel/skylake/skl.c