Merge branch 'for-linus' into for-next
authorTakashi Iwai <tiwai@suse.de>
Sun, 5 Jan 2020 08:19:24 +0000 (09:19 +0100)
committerTakashi Iwai <tiwai@suse.de>
Sun, 5 Jan 2020 08:19:34 +0000 (09:19 +0100)
commit5d8398aa595dc3055dde003b6464963b71e4d8e2
tree2b756dcea50d3ca0e5d2ac18f07384014f78ca5c
parent5fab5829674c279839a7408ab30c71c6dfe726b9
parent51d4efab7865e6ea6a4ebcd25b3f03c019515c4c
Merge branch 'for-linus' into for-next

Merge 5.5-rc devel branch back for applying the conflicting USB-audio
fix.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/pci/hda/hda_intel.c
sound/pci/hda/patch_realtek.c
sound/pci/ice1712/ice1724.c
sound/usb/pcm.c