Merge branch 'for-linus' into for-next
authorTakashi Iwai <tiwai@suse.de>
Fri, 4 Mar 2016 07:41:41 +0000 (08:41 +0100)
committerTakashi Iwai <tiwai@suse.de>
Fri, 4 Mar 2016 07:41:41 +0000 (08:41 +0100)
commit6defb60ae4ffe92c29291ed49695daa255b8f559
tree67506a05d171df966b8ca9efa261fa307025e91e
parent03367bf7fd30165bda3b037b3078cfa231ba33b7
parent790b415c98de62602810b0eedce26f0f9d6ddd78
Merge branch 'for-linus' into for-next

Resolved the conflicts with the latest HDA HDMI fixes.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/pci/hda/patch_hdmi.c
sound/usb/quirks.c