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

Merge branch 'for-linus' into for-next 

Need to merge the fixes regarding EPSS.

Conflicts:
	sound/pci/hda/hda_codec.c
parents 5d908ab9 c36b5b05
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