From: Takashi Iwai <tiwai@suse.de>
Date: Fri, 29 May 2015 08:27:50 +0000 (+0200)
Subject: Merge branch 'for-linus' into for-next
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=984a8547052711867332eeaec4141755fc040553;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

Merge branch 'for-linus' into for-next

Merge back the latest HD-audio stuff for further development.
---

984a8547052711867332eeaec4141755fc040553
diff --cc sound/pci/hda/patch_realtek.c
index 4d11fbfca5e2,464168426465..da2d37158d70
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@@ -3738,10 -3742,8 +3744,9 @@@ static void alc_headset_mode_default(st
  		break;
  	case 0x10ec0286:
  	case 0x10ec0288:
 +	case 0x10ec0298:
  		alc_process_coef_fw(codec, coef0288);
  		break;
- 		break;
  	case 0x10ec0292:
  		alc_process_coef_fw(codec, coef0292);
  		break;