]> 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)
commite59d637b3bb97730d22c89a8be27c95611d44195
tree986201af09ea4cd734ac5afa4a069cb9e56b78e9
parent5d151bbeae7de4bb74997f616a4b81818b28b62d
parent72f9d53593fd673a0229710a3d22a39e6b24c00c
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