Merge 5.5-rc devel branch back for applying the conflicting USB-audio
fix.
Signed-off-by: Takashi Iwai <tiwai@suse.de>