Merge branch 'pci/mike-x86-tra' into next
commit0dcccc5c53c55565a6b1061e1b15894495c7c9b9
authorBjorn Helgaas <bhelgaas@google.com>
Fri, 9 Nov 2012 17:00:10 +0000 (9 10:00 -0700)
committerBjorn Helgaas <bhelgaas@google.com>
Fri, 9 Nov 2012 17:00:10 +0000 (9 10:00 -0700)
tree75a19916763452385e3843d944943779f91b7961
parent05508270064efd674e8f2a047911dcd7776aaae0
parentb4873931cc8c934a9893d5962bde97aca23be983
Merge branch 'pci/mike-x86-tra' into next

* pci/mike-x86-tra:
  x86/PCI: Allow x86 platforms to use translation offsets
arch/x86/pci/acpi.c