Merge branch 'for-linus' into for-next
authorTakashi Iwai <tiwai@suse.de>
Tue, 26 Apr 2016 08:04:19 +0000 (10:04 +0200)
committerTakashi Iwai <tiwai@suse.de>
Tue, 26 Apr 2016 08:12:46 +0000 (10:12 +0200)
commita33d59599653edc6469c582f0ffd99c5fc58af04
tree3edf0d94ce44dc12139d90ff850bbf222e82db5e
parent58a8738cfcdec389b3764a636303f97b57f85193
parentbb03ed216370cb021f377f923471e56d1de3ff5d
Merge branch 'for-linus' into for-next

For taking back the recent change of HDA HDMI fixes for i915 HSW/BDW.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
include/sound/hda_i915.h
sound/hda/hdac_i915.c
sound/pci/hda/hda_generic.c
sound/pci/hda/patch_hdmi.c