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

Merge branch 'for-linus' into for-next 



Resolve conflicts and correct the hex numbers, too.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parents 5396c4bd b81cbf7a
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