Linus Torvalds 16ee8db6a9 Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* '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
2011-01-11 11:11:46 -08:00
..
2010-08-27 11:12:29 -07:00
2010-10-26 16:52:08 -07:00
2010-07-21 11:33:27 -07:00
2010-11-12 00:45:41 +01:00
2010-07-21 21:23:51 -07:00
2010-08-27 11:12:29 -07:00
2010-12-30 12:20:28 +01:00
2010-09-22 16:33:03 -04:00
2011-01-07 15:08:53 +01:00
2010-10-27 18:03:10 -07:00
2011-01-07 15:08:53 +01:00
2009-12-09 16:28:59 -08:00
2010-03-26 11:33:57 +01:00
2011-01-07 15:08:53 +01:00
2010-10-18 10:49:34 -04:00