Merge branch 'topic/alex-vfio-prep' into next
authorBjorn Helgaas <bhelgaas@google.com>
Wed, 13 Jun 2012 23:04:54 +0000 (17:04 -0600)
committerBjorn Helgaas <bhelgaas@google.com>
Wed, 13 Jun 2012 23:04:54 +0000 (17:04 -0600)
commitcc2fa3fa320d5f40a12713c104bbe5d3da4636e4
tree342445a784c566116505ab8c9e7a24803a6e70c4
parent10c480933d0ad2ea27630cbaa723a5d33dbece00
parenta0dee2ed0cdc666b5622f1fc74979355a6b36850
Merge branch 'topic/alex-vfio-prep' into next

* topic/alex-vfio-prep:
  PCI: misc pci_reg additions
  PCI: create common pcibios_err_to_errno
  PCI: export pci_user functions for use by other drivers
  PCI: add ACS validation utility
  PCI: add PCI DMA source ID quirk
drivers/pci/pci.c
drivers/pci/pci.h
include/linux/pci.h