Merge branch 'for-linus' into for-next

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

diff --cc drivers/gpu/drm/i915/i915_reg.h
Simple merge

diff --cc sound/pci/hda/hda_intel.c
Simple merge

diff --cc sound/pci/hda/patch_realtek.c
index 4d11fbfca5e202d249098d767e9b3a5e6dd9ea52,4641684264653c5ef265e6f61f6ef8c26bfa5f86..da2d37158d7079ca97c36c3854dbf5d65b6210d9
--- 1/sound/pci/hda/patch_realtek.c
--- 2/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;

diff --cc sound/pci/hda/patch_sigmatel.c
Simple merge