Merge branch 'fix/hda' into topic/hda

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_conexant.c
Simple merge

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

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