commit e6a997eda9f76e83b7820b6e71406a43374b9f0f
author Linus Torvalds <torvalds@linux-foundation.org> Sat Dec 20 11:07:18 2008 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> Sat Dec 20 11:07:18 2008 -0800
tree 4450ece27c396a57a64dfd784bd2c08ebe82193d
parent 9a1d1035631ad8b3edf301b273c30bdfc75de01e
parent 280a9ca5d0663b185ddc4443052076c29652a328

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: fix resume (S2R) broken by Intel microcode module, on A110L
  x86 gart: don't complain if no AMD GART found
  AMD IOMMU: panic if completion wait loop fails
  AMD IOMMU: set cmd buffer pointers to zero manually
  x86: re-enable MCE on secondary CPUS after suspend/resume
  AMD IOMMU: allocate rlookup_table with __GFP_ZERO