git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1b8ba39 9340e1c)
Merge branch 'x86/mpparse' into x86/devel
authorIngo Molnar <mingo@elte.hu>
Tue, 8 Jul 2008 09:14:58 +0000 (11:14 +0200)
committerIngo Molnar <mingo@elte.hu>
Tue, 8 Jul 2008 09:14:58 +0000 (11:14 +0200)
Conflicts:

arch/x86/Kconfig
arch/x86/kernel/io_apic_32.c
arch/x86/kernel/setup_64.c
arch/x86/mm/init_32.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>

Trivial merge
Pandora Kernel Repository