Merge branch 'x86-mrst-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 18 May 2010 16:27:49 +0000 (09:27 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 18 May 2010 16:27:49 +0000 (09:27 -0700)
commit96fbeb973a7e17594a429537201611ca0b395622
tree0f90e3724f804776d6ae00009c2e30bd4ab015aa
parent1f8caa986a5f4de2e40f3defe66a07b4c5a019c2
parentfea24e28c663e62663097f0ed3b8ff1f9a87f15e
Merge branch 'x86-mrst-for-linus' of git://git./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
arch/x86/pci/mrst.c