Conflicts:

	arch/x86/kernel/genapic_64.c

Manual merge:

	arch/x86/kernel/genx2apic_uv_x.c
Signed-off-by: NIngo Molnar <mingo@elte.hu>