Merge branch 'topic/hda' into for-next

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

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

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

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

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