diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2014-09-22 12:31:01 -0600 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2014-09-22 12:31:01 -0600 |
| commit | 134cd00d766fc7014b53d9cea67a6bcb894ae51e (patch) | |
| tree | 3149b2072ab97626cfabc81794a438ec5299e8e3 /drivers/mfd/88pm800.c | |
| parent | a2351efeb3b4e11a97117e048027a9d09855d309 (diff) | |
| parent | f3dbd802b3caf8da92173870bc270dda6b3f84ba (diff) | |
| parent | 63ddc0b8fe5ebbac88e2ac84b489470bf3a22965 (diff) | |
| parent | be63497c413e22d5abdf32313f4b469af6aa7f4c (diff) | |
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