Merge branch 'for-linus' into for-next
authorTakashi Iwai <tiwai@suse.de>
Mon, 20 Jan 2020 10:44:35 +0000 (11:44 +0100)
committerTakashi Iwai <tiwai@suse.de>
Mon, 20 Jan 2020 10:44:51 +0000 (11:44 +0100)
commit9d0af44c2ed036c663832f3b764ffd1109c8b79e
tree629864b4ce2743873f672d2ca03c0e295fb98525
parent5af29028fd6db9438b5584ab7179710a0a22569d
parent4d024fe8f806e20e577cc934204c5784c7063293
Merge branch 'for-linus' into for-next

Resolved the merge conflict in HD-audio Tegra driver.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
include/sound/hdaudio.h
sound/pci/hda/hda_tegra.c
sound/usb/pcm.c