Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86: Fix Moorestown VRTC fixmap placement
  x86/gpio: Implement x86 gpio_to_irq convert function
  x86, UV: Fix APICID shift for Westmere processors
  x86: Use PCI method for enabling AMD extended config space before MSR method
  x86: tsc: Prevent delayed init if initial tsc calibration failed
  x86, lapic-timer: Increase the max_delta to 31 bits
  x86: Fix sparse non-ANSI function warnings in smpboot.c
  x86, numa: Fix CONFIG_DEBUG_PER_CPU_MAPS without NUMA emulation
  x86, AMD, PCI: Add AMD northbridge PCI device id for CPU families 12h and 14h
  x86, numa: Fix cpu to node mapping for sparse node ids
  x86, numa: Fake node-to-cpumask for NUMA emulation
  x86, numa: Fake apicid and pxm mappings for NUMA emulation
  x86, numa: Avoid compiling NUMA emulation functions without CONFIG_NUMA_EMU
  x86, numa: Reduce minimum fake node size to 32M

Fix up trivial conflict in arch/x86/kernel/apic/x2apic_uv_x.c

diff --cc arch/x86/kernel/apic/apic.c
Simple merge

diff --cc arch/x86/kernel/apic/x2apic_uv_x.c
index 89b9f56,f4f9e95..bd16b58
--- 1/arch/x86/kernel/apic/x2apic_uv_x.c
--- 2/arch/x86/kernel/apic/x2apic_uv_x.c
+++ b/arch/x86/kernel/apic/x2apic_uv_x.c
@@@ -378,7 -378,7 +378,7 @@@ struct apic __refdata apic_x2apic_uv_x 
  
  static __cpuinit void set_x2apic_extra_bits(int pnode)
  {
-       __this_cpu_write(x2apic_extra_bits, (pnode << 6));
 -      __get_cpu_var(x2apic_extra_bits) = (pnode << uvh_apicid.s.pnode_shift);
++      __this_cpu_write(x2apic_extra_bits, pnode << uvh_apicid.s.pnode_shift);
  }
  
  /*

diff --cc arch/x86/kernel/smpboot.c
Simple merge

diff --cc arch/x86/kernel/tsc.c
Simple merge

diff --cc include/linux/pci_ids.h
Simple merge