This merges and resolves the non-trivial conflicts with the recent fix
for hda-i915 binding fallback.

Conflicts:
	sound/pci/hda/hda_intel.c
Signed-off-by: Takashi Iwai <tiwai@suse.de>