From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 18 May 2010 16:27:49 +0000 (-0700)
Subject: Merge branch 'x86-mrst-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v2.6.35-rc1~509
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=96fbeb973a7e17594a429537201611ca0b395622;p=~shefty%2Frdma-dev.git

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

* 'x86-mrst-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86, mrst: add nop functions to x86_init mpparse functions
  x86, mrst, pci: return 0 for non-present pci bars
  x86: Avoid check hlt for newer cpus
---

96fbeb973a7e17594a429537201611ca0b395622