From: Bjorn Helgaas <bhelgaas@google.com>
Date: Mon, 22 Sep 2014 18:31:01 +0000 (-0600)
Subject: Merge branches 'pci/enumeration', 'pci/misc' and 'pci/virtualization' into next
X-Git-Tag: v3.18-rc1~110^2~13
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=134cd00d766fc7014b53d9cea67a6bcb894ae51e;p=uclinux-h8%2Flinux.git

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

* pci/enumeration:
  PCI: Enable CRS Software Visibility for root port if it is supported
  PCI: Check only the Vendor ID to identify Configuration Request Retry

* pci/misc:
  PCI: Parenthesize PCI_DEVID and PCI_VPD_LRDT_ID parameters
  PCI: Increase IBM ipr SAS Crocodile BARs to at least system page size
  PCI/AER: Make <linux/aer.h> standalone includable

* pci/virtualization:
  PCI: Use device flag helper functions
  xen/pciback: Use PCI device flag helper functions
  KVM: Use PCI device flag helper functions
  PCI: Add device flag helper functions
  PCI: Assume all Mellanox devices have broken INTx masking
---

134cd00d766fc7014b53d9cea67a6bcb894ae51e