Commit 6e15cf04 authored 16 years ago by Ingo Molnar

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: Ingo Molnar <mingo@elte.hu>

parents be0ea696 60db5642

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing with 90 additions and 50 deletions

Please register or to comment