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

author	Ingo Molnar <mingo@elte.hu>
	Fri, 1 May 2009 17:02:50 +0000 (19:02 +0200)
committer	Ingo Molnar <mingo@elte.hu>
	Fri, 1 May 2009 17:02:50 +0000 (19:02 +0200)
commit	4420471f14b79f2a42e4603be7794ea49b68bca4
tree	d391d25458bc0aa86dcf2823fd6c1464883b0533	tree \| snapshot
parent	15e957d08dd4a841359cfec59ecb74041e0097aa	commit \| diff
parent	e0e42142bab96404de535cceb85d6533d5ad7942	commit \| diff

Merge branch 'x86/apic' into irq/numa

Conflicts:
arch/x86/kernel/apic/io_apic.c

Merge reason: non-trivial interaction between ongoing work in io_apic.c
and the NUMA migration feature in the irq tree.

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

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/include/asm/io_apic.h	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/apic/io_apic.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/apic/x2apic_uv_x.c	diff1 \|	diff2 \|	blob \| history
drivers/pci/intr_remapping.c	diff1 \|	diff2 \|	blob \| history