Merge branch 'topic/hda-core-intel' into topic/hda-acomp
authorTakashi Iwai <tiwai@suse.de>
Thu, 12 Jul 2018 11:58:07 +0000 (13:58 +0200)
committerTakashi Iwai <tiwai@suse.de>
Thu, 12 Jul 2018 11:58:07 +0000 (13:58 +0200)
commit9a9b13dd275dfe49ee0cf3ae5dc931069eb41475
tree668eb21a6a1f9669fa251505ec5ebf41abfaa900
parentc5a59d2477abf04e1b77152bef49383fd212da8d
parentcb04ba33187ca571142b67c2fb60d0a8c24994c8
Merge branch 'topic/hda-core-intel' into topic/hda-acomp
sound/pci/hda/hda_codec.c
sound/pci/hda/hda_codec.h