]> err.no Git - linux-2.6/commit
Merge branch 'linus' into tmp.x86.mpparse.new
authorIngo Molnar <mingo@elte.hu>
Tue, 8 Jul 2008 08:32:56 +0000 (10:32 +0200)
committerIngo Molnar <mingo@elte.hu>
Tue, 8 Jul 2008 08:32:56 +0000 (10:32 +0200)
commit896395c290f902576270d84291c1f7f8bfbe339d
tree650114bff3a5f808ee1d713ecc443b0eaab2e1c3
parentaf1cf204ba2fd8135933a2e4df523fb1112dc0e2
parent1b40a895df6c7d5a80e71f65674060b03d84bbef
Merge branch 'linus' into tmp.x86.mpparse.new
14 files changed:
Documentation/kernel-parameters.txt
arch/x86/Kconfig
arch/x86/Kconfig.debug
arch/x86/kernel/Makefile
arch/x86/kernel/acpi/boot.c
arch/x86/kernel/apic_64.c
arch/x86/kernel/head_32.S
arch/x86/kernel/io_apic_32.c
arch/x86/kernel/setup_32.c
arch/x86/kernel/smpboot.c
arch/x86/lguest/boot.c
arch/x86/xen/enlighten.c
include/linux/mm.h
mm/page_alloc.c