From: Takashi Iwai <tiwai@suse.de>
Date: Thu, 9 Jul 2009 16:48:38 +0000 (+0200)
Subject: Merge branch 'fix/hda' into topic/hda
X-Git-Tag: firefly_0821_release~11841^2~12^2~111
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=305355aad89f1b7eb27cb210fad2f9d3c67b2572;p=firefly-linux-kernel-4.4.55.git

Merge branch 'fix/hda' into topic/hda

Conflicts:
	sound/pci/hda/patch_realtek.c

Signed-off-by: Takashi Iwai <tiwai@suse.de>
---

305355aad89f1b7eb27cb210fad2f9d3c67b2572