Skip to content
Snippets Groups Projects
Commit ec000109 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'perf/urgent' into perf/core, to resolve conflict and to prepare for new patches 


Conflicts:
	arch/x86/kernel/traps.c

Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 8c6e549a e041e328
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 96 additions and 55 deletions
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