git.oblomov.eu Git - linux-2.6/commit

author	Ingo Molnar <mingo@elte.hu>
	Tue, 8 Jul 2008 09:14:58 +0000 (11:14 +0200)
committer	Ingo Molnar <mingo@elte.hu>
	Tue, 8 Jul 2008 09:14:58 +0000 (11:14 +0200)
commit	3de352bbd86f890dd0c5e1c09a6a1b0b29e0f8ce
tree	d4c5eba8cd2abefd7c9f16d089393f0f5999cf63	tree \| snapshot
parent	1b8ba39a3fad9c58532f6dad12c94d6e675be656	commit \| diff
parent	9340e1ccdf7b9b22a2be7f51cd74e8b5e11961bf	commit \| diff

Merge branch 'x86/mpparse' into x86/devel

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>

26 files changed:

Documentation/kernel-parameters.txt	diff1 \|	diff2 \|	blob \| history
arch/x86/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/x86/Kconfig.debug	diff1 \|	diff2 \|	blob \| history
arch/x86/Makefile	diff1 \|	diff2 \|	blob \| history
arch/x86/boot/compressed/misc.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/Makefile	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/acpi/boot.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/aperture_64.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/apic_32.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/apic_64.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/io_apic_32.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/io_apic_64.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/setup_64.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/smpboot.c	diff1 \|	diff2 \|	blob \| history
arch/x86/mm/discontig_32.c	diff1 \|	diff2 \|	blob \| history
arch/x86/mm/init_32.c	diff1 \|	diff2 \|	blob \| history
arch/x86/mm/init_64.c	diff1 \|	diff2 \|	blob \| history
arch/x86/mm/k8topology_64.c	diff1 \|	diff2 \|	blob \| history
arch/x86/pci/Makefile_32	diff1 \|	diff2 \|	blob \| history
arch/x86/pci/amd_bus.c	diff1 \|	diff2 \|	blob \| history
arch/x86/xen/enlighten.c	diff1 \|	diff2 \|	blob \| history
arch/x86/xen/setup.c	diff1 \|	diff2 \|	blob \| history
include/asm-x86/bootparam.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/e820.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/io_apic.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/system.h	diff1 \|	diff2 \|	blob \| history

Making Linux better for my computers

RSS Atom

Documentation/kernel-parameters.txt	diff1 \|	diff2 \|	blob \| history
arch/x86/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/x86/Kconfig.debug	diff1 \|	diff2 \|	blob \| history
arch/x86/Makefile	diff1 \|	diff2 \|	blob \| history
arch/x86/boot/compressed/misc.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/Makefile	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/acpi/boot.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/aperture_64.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/apic_32.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/apic_64.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/io_apic_32.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/io_apic_64.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/setup_64.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/smpboot.c	diff1 \|	diff2 \|	blob \| history
arch/x86/mm/discontig_32.c	diff1 \|	diff2 \|	blob \| history
arch/x86/mm/init_32.c	diff1 \|	diff2 \|	blob \| history
arch/x86/mm/init_64.c	diff1 \|	diff2 \|	blob \| history
arch/x86/mm/k8topology_64.c	diff1 \|	diff2 \|	blob \| history
arch/x86/pci/Makefile_32	diff1 \|	diff2 \|	blob \| history
arch/x86/pci/amd_bus.c	diff1 \|	diff2 \|	blob \| history
arch/x86/xen/enlighten.c	diff1 \|	diff2 \|	blob \| history
arch/x86/xen/setup.c	diff1 \|	diff2 \|	blob \| history
include/asm-x86/bootparam.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/e820.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/io_apic.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/system.h	diff1 \|	diff2 \|	blob \| history