commit | 608235a30706814dfff5b23938dc5f14fdb7e7e3 | [log] [tgz] |
---|---|---|
author | Bjorn Helgaas <bhelgaas@google.com> | Wed Dec 18 14:04:35 2013 -0700 |
committer | Bjorn Helgaas <bhelgaas@google.com> | Wed Dec 18 14:04:35 2013 -0700 |
tree | a190e6110cb0bc22bac8b5bb5e66a4258b5a2150 | |
parent | a737f76baee3d44cb25285986812e9cd97fd6002 [diff] | |
parent | 274127a1fdbad3c0d64e813521f4a0ef96cfc70e [diff] |
Merge branch 'pci/vc' into next * 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())