]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'for-linus' into for-next
authorTakashi Iwai <tiwai@suse.de>
Sun, 26 Jan 2020 08:31:34 +0000 (09:31 +0100)
committerTakashi Iwai <tiwai@suse.de>
Sun, 26 Jan 2020 08:31:41 +0000 (09:31 +0100)
commit3e926e01b670e296bb9965f5f41f76f6bf1b0034
tree986201af09ea4cd734ac5afa4a069cb9e56b78e9
parent20808b98f43508f72f1215b3e11a260c4ad5560d
parent302494a26d0bf58743eff93916f18d0277088769
Merge branch 'for-linus' into for-next

Resolve conflicts and correct the hex numbers, too.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/pci/hda/hda_intel.c
sound/pci/hda/patch_conexant.c
sound/usb/format.c