Merge branch 'x86/urgent' into x86/platform, to resolve conflict



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

Signed-off-by: Ingo Molnar <mingo@kernel.org>

arch/x86/kernel/apic/x2apic_uv_x.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -1395,8 +1395,6 @@ void __init uv_system_init(void)
		}
		pr_info("UV: Found %s hub\n", hub);

		/* We now only need to map the MMRs on UV1 */
		if (is_uv1_hub())
		map_low_mmrs();

		uv_bios_init(); /* get uv_systab for decoding */