Merge branch 'for-linus' into test/usb-resume

diff --cc sound/pci/hda/hda_intel.c
Simple merge

diff --cc sound/pci/hda/patch_realtek.c
Simple merge

diff --cc sound/usb/mixer.c
Simple merge

diff --cc sound/usb/mixer_quirks.c
Simple merge

diff --cc sound/usb/quirks.c
Simple merge