tree 82cb8a6e1cec2df8adaf527b92667a4c5ba29254
parent 6b9bd1e3ee8f23b55d407becf4f6f422ec4610f2
parent 0b950f0f3c67e42f18c655a3ab3e36ea192635bb
author Bjorn Helgaas <bhelgaas@google.com> 1389656828 -0700
committer Bjorn Helgaas <bhelgaas@google.com> 1389656828 -0700

Merge branch 'pci/dead-code' into next

* pci/dead-code:
  PCI: Make local functions static
  PCI: Remove unused alloc_pci_dev()
  PCI: Remove unused pci_renumber_slot()
  PCI: Remove unused pcie_aspm_enabled()
  PCI: Remove unused pci_vpd_truncate()
  PCI: Remove unused ID-Based Ordering support
  PCI: Remove unused Optimized Buffer Flush/Fill support
  PCI: Remove unused Latency Tolerance Reporting support
  PCI: Removed unused parts of Page Request Interface support

Conflicts:
	drivers/pci/pci.c
	include/linux/pci.h