]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
projects / users / jedix / linux-maple.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 10c4809 a0dee2e)
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)
* 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

1  2 
drivers/pci/pci.c patch | diff1 | diff2 | blob | history
drivers/pci/pci.h patch | diff1 | diff2 | blob | history
include/linux/pci.h patch | diff1 | diff2 | blob | history

diff --cc drivers/pci/pci.c
Simple merge
diff --cc drivers/pci/pci.h
Simple merge
diff --cc include/linux/pci.h
Simple merge
Unnamed repository; edit this file 'description' to name the repository.