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

projects / linux-2.6 / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 26d809a 30a2f3c)

author	Ingo Molnar <mingo@elte.hu>
	Thu, 14 Aug 2008 08:55:26 +0000 (10:55 +0200)
committer	Ingo Molnar <mingo@elte.hu>
	Thu, 14 Aug 2008 08:55:26 +0000 (10:55 +0200)
commit	d4439087d316613548c70472291bf4ca646ce24b
tree	4819f39cbbfcc2ed9c9f85c7a91cbf142f5b02d4	tree \| snapshot
parent	26d809af6397ce5c37f5c44d89734d19cce1ad25	commit \| diff
parent	30a2f3c60a84092c8084dfe788b710f8d0768cd4	commit \| diff

Merge commit 'v2.6.27-rc3' into x86/xsave

Conflicts:

arch/x86/kernel/genapic_64.c
include/asm-x86/kvm_host.h

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

14 files changed:

arch/x86/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/apic_32.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/mpparse.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/setup.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/smpboot.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/vmi_32.c	diff1 \|	diff2 \|	blob \| history
include/asm-x86/efi.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/hw_irq.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/iommu.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/irq_vectors.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/kvm_host.h	diff1 \|	diff2 \|	blob \| history
kernel/irq/manage.c	diff1 \|	diff2 \|	blob \| history

Making Linux better for my computers