]> nv-tegra.nvidia Code Review - linux-2.6.git/commit
Merge branch 'linus' into x86/x2apic
authorIngo Molnar <mingo@elte.hu>
Mon, 11 Aug 2008 09:19:20 +0000 (11:19 +0200)
committerIngo Molnar <mingo@elte.hu>
Mon, 11 Aug 2008 09:19:20 +0000 (11:19 +0200)
commit8067794bec1cc5de1431102cf0a6a1c7ce75cd85
tree2bfa0fba060d253bbd972282b29a3d60c3e7cb7f
parent7ab6af7ab69df8c9c5fbc380004fb81187742096
parent796aadeb1b2db9b5d463946766c5bbfd7717158c
Merge branch 'linus' into x86/x2apic

Conflicts:

arch/x86/kernel/genapic_64.c

Manual merge:

arch/x86/kernel/genx2apic_uv_x.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>
Documentation/kernel-parameters.txt
arch/x86/Kconfig
arch/x86/kernel/genx2apic_uv_x.c
arch/x86/kernel/setup.c
arch/x86/lguest/boot.c
kernel/irq/manage.c