Merge branch 'for-linus' into for-next

diff --cc sound/core/pcm_native.c
Simple merge

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

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

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

diff --cc sound/pci/ice1712/ice1724.c
Simple merge

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