Skip to content
Commit 6defb60a authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'for-linus' into for-next 



Resolved the conflicts with the latest HDA HDMI fixes.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parents 03367bf7 790b415c
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment