From: Bjorn Helgaas <bhelgaas@google.com>
Date: Thu, 25 Sep 2014 19:52:02 +0000 (-0600)
Subject: Merge branches 'pci/enumeration', 'pci/virtualization' and 'pci/cleanup' into next
X-Git-Tag: omap-for-v3.19/prcm-cleanup~136^2~8
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c0ed74e9d026af7b4f79bc29aaac37aac5b6e0a4;p=pandora-kernel.git

Merge branches 'pci/enumeration', 'pci/virtualization' and 'pci/cleanup' into next

* pci/enumeration:
  PCI: Generate uppercase hex for modalias interface class

* pci/virtualization:
  PCI: Add ACS quirk for Solarflare SFC9120 & SFC9140
  PCI: Remove unused pci_get_dma_source()
  PCI: Remove unused pci_find_upstream_pcie_bridge()

* pci/cleanup:
  PCI: Remove assignment from complicated "if" conditions
  PCI: Remove assignment from "if" conditions
  PCI: Remove unnecessary curly braces
  PCI: Add space before open parenthesis
---

c0ed74e9d026af7b4f79bc29aaac37aac5b6e0a4
Reading git-diff-tree failed