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

Skip to content
Commit bfe2a3c3 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'core/percpu' into perfcounters/core



Conflicts:
	arch/x86/include/asm/hardirq_32.h
	arch/x86/include/asm/hardirq_64.h

Semantic merge:
	arch/x86/include/asm/hardirq.h
	[ added apic_perf_irqs field. ]

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parents 77835492 35d266a2
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment