Merge tag 'hda-codec-h-move' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...

author Takashi Iwai <tiwai@suse.de>

Thu, 30 Aug 2018 14:55:38 +0000 (16:55 +0200)

committer Takashi Iwai <tiwai@suse.de>

Thu, 30 Aug 2018 14:55:38 +0000 (16:55 +0200)
author Takashi Iwai <tiwai@suse.de>
Thu, 30 Aug 2018 14:55:38 +0000 (16:55 +0200)
committer Takashi Iwai <tiwai@suse.de>
Thu, 30 Aug 2018 14:55:38 +0000 (16:55 +0200)
diff --cc sound/pci/hda/hda_controller.h
Simple merge
diff --cc sound/pci/hda/hda_intel.c
Simple merge
diff --cc sound/pci/hda/hda_tegra.c
Simple merge
author	Takashi Iwai <tiwai@suse.de>
	Thu, 30 Aug 2018 14:55:38 +0000 (16:55 +0200)
committer	Takashi Iwai <tiwai@suse.de>
	Thu, 30 Aug 2018 14:55:38 +0000 (16:55 +0200)
		1	2
sound/pci/hda/hda_controller.h	patch \|	diff1 \|	diff2 \|	blob \| history
sound/pci/hda/hda_intel.c	patch \|	diff1 \|	diff2 \|	blob \| history
sound/pci/hda/hda_tegra.c	patch \|	diff1 \|	diff2 \|	blob \| history