]> 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)
commit91c6430d809a5df4c693a9890bc79293fe02c61a
tree629864b4ce2743873f672d2ca03c0e295fb98525
parent2d5648ffb86e52cb5eece28a70688430a3a8490f
parentca456ca8b3401069af1aac7217394b2f8a6f7aac
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