From: Bjorn Helgaas <bhelgaas@google.com>
Date: Mon, 13 Jan 2014 23:47:08 +0000 (-0700)
Subject: Merge branch 'pci/dead-code' into next
X-Git-Tag: v3.14-rc1~132^2~5
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=597db6f38c4bcb90406d4e2f56446ba5a5dc20c6;p=pandora-kernel.git

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

597db6f38c4bcb90406d4e2f56446ba5a5dc20c6
Reading git-diff-tree failed