tree 1d74afd1a97cd1e9f71e07e8a041a2fcee795f62
parent 27e1c8ee0170e80f6426c35d54f3b5cd9dadb25b
parent f9726bfd4b14401d294207a70c7c0c4be8a8c6cc
author Bjorn Helgaas <bhelgaas@google.com> 1354915653 -0700
committer Bjorn Helgaas <bhelgaas@google.com> 1354915653 -0700

Merge branch 'pci/daniel-numachip' into next

* pci/daniel-numachip:
  x86/PCI: Add NumaChip remote PCI support