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

projects / linux-2.6 / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: b55793f b635ace)

author	Ingo Molnar <mingo@elte.hu>
	Thu, 14 Aug 2008 12:58:01 +0000 (14:58 +0200)
committer	Ingo Molnar <mingo@elte.hu>
	Thu, 14 Aug 2008 12:58:01 +0000 (14:58 +0200)
commit	51ca3c679194e7435c25b8e77b0a73c597e41ae9
tree	a681dca369607ab0f371d5246b0f75140b860a8a	tree \| snapshot
parent	b55793f7528ce1b73c25b3ac8a86a6cda2a0f9a4	commit \| diff
parent	b635acec48bcaa9183fcbf4e3955616b0d4119b5	commit \| diff

Merge branch 'linus' into x86/core

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

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

15 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/i387.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