]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit6dbb7a8b5bc0504c1b73462f35557d8ed51bf31d
tree629864b4ce2743873f672d2ca03c0e295fb98525
parent79e65ef414706ed6db03c0d84992441c79579f2d
parentd6cef1be193777688e7795849f2e245f296acdcb
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