From: Bjorn Helgaas <bhelgaas@google.com>
Date: Wed, 13 Jun 2012 23:04:54 +0000 (-0600)
Subject: Merge branch 'topic/alex-vfio-prep' into next
X-Git-Tag: v3.6-rc1~112^2~18
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=cc2fa3fa320d5f40a12713c104bbe5d3da4636e4;p=linux.git

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
---

cc2fa3fa320d5f40a12713c104bbe5d3da4636e4