Merge branch 'for-linus' into for-next

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

diff --cc sound/pci/hda/hda_generic.h
Simple merge

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

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

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