From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 18 May 2011 10:14:34 +0000 (-0700)
Subject: Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v2.6.39~6
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=39dcfa552c3fd4179f470e0b1f716db6241e95d1;p=~shefty%2Frdma-dev.git

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, AMD: Fix ARAT feature setting again
  Revert "x86, AMD: Fix APIC timer erratum 400 affecting K8 Rev.A-E processors"
  x86, apic: Fix spurious error interrupts triggering on all non-boot APs
  x86, mce, AMD: Fix leaving freed data in a list
  x86: Fix UV BAU for non-consecutive nasids
  x86, UV: Fix NMI handler for UV platforms
---

39dcfa552c3fd4179f470e0b1f716db6241e95d1