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)
commit9b132f2764e5a04bfb2e6c6f51cf5a729617d6a4
tree986201af09ea4cd734ac5afa4a069cb9e56b78e9
parent5396c4bd9fd8429050f6191663b6c491e6402da2
parentb81cbf7abfc94878a3c6f0789f2185ee55b1cc21
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