tree f47e59a99feaa32a625fb0e720c9914d2e364444
parent 39059cceeda478cd040d521b9541d1113035c908
parent 4adc8b71cc142f9a7b44b13b99aab38ba897c56f
author Linus Torvalds <torvalds@linux-foundation.org> 1275605242 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1275605242 -0700

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

* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86, smpboot: Fix cores per node printing on boot
  x86/amd-iommu: Fall back to GART if initialization fails
  x86/amd-iommu: Fix crash when request_mem_region fails
  x86/mm: Remove unused DBG() macro
  arch/x86/kernel: Add missing spin_unlock