git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: be0ea69 60db564)
Merge branch 'core/percpu' into percpu-cpumask-x86-for-linus-2
authorIngo Molnar <mingo@elte.hu>
Thu, 26 Mar 2009 20:39:17 +0000 (21:39 +0100)
committerIngo Molnar <mingo@elte.hu>
Fri, 27 Mar 2009 16:28:43 +0000 (17:28 +0100)
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>

Trivial merge
Pandora Kernel Repository