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

Merge branch 'auto-ftrace-next' into tracing/for-linus 


Conflicts:

	arch/x86/kernel/entry_32.S
	arch/x86/kernel/process_32.c
	arch/x86/kernel/process_64.c
	arch/x86/lib/Makefile
	include/asm-x86/irqflags.h
	kernel/Makefile
	kernel/sched.c

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parents d14c8a68 6712e299
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 737 additions and 9 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