Skip to content
GitLab
Commit d820306c authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'for-linus' into for-next 

For updating the HDMI chmap fix.

Conflicts:
	sound/pci/hda/patch_hdmi.c
parents 6d5eba5a 39edac70
Hide whitespace changes
Inline Side-by-side
Supports Markdown
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