]> www.infradead.org Git - users/hch/dma-mapping.git/commitdiff
projects / users / hch / dma-mapping.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a737f76 274127a)
Merge branch 'pci/vc' into next
authorBjorn Helgaas <bhelgaas@google.com>
Wed, 18 Dec 2013 21:04:35 +0000 (14:04 -0700)
committerBjorn Helgaas <bhelgaas@google.com>
Wed, 18 Dec 2013 21:04:35 +0000 (14:04 -0700)
* pci/vc:
  PCI: Rename PCI_VC_PORT_REG1/2 to PCI_VC_PORT_CAP1/2
  PCI: Add Virtual Channel to save/restore support
  PCI: Add support for save/restore of extended capabilities
  PCI: Add pci_wait_for_pending() (refactor pci_wait_for_pending_transaction())

1  2 
include/linux/pci.h patch | diff1 | diff2 | blob | history
include/uapi/linux/pci_regs.h patch | diff1 | diff2 | blob | history

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