Merge branch 'fix/hda' into topic/hda

Conflicts:
	sound/pci/hda/hda_intel.c