Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Skip to content
Commit 94aca808 authored by H. Peter Anvin's avatar H. Peter Anvin
Browse files

Merge remote-tracking branch 'origin/x86/urgent' into x86/vdso 



Resolved Conflicts:
	arch/x86/vdso/vdso32-setup.c

Signed-off-by: default avatarH. Peter Anvin <hpa@linux.intel.com>
parents 03c1b4e8 368b69a5
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