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

Merge branch 'core/percpu' into percpu-cpumask-x86-for-linus-2



Conflicts:
	arch/parisc/kernel/irq.c
	arch/x86/include/asm/fixmap_64.h
	arch/x86/include/asm/setup.h
	kernel/irq/handle.c

Semantic merge:
        arch/x86/include/asm/fixmap.h

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parents be0ea696 60db5642
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