diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2016-04-25 14:35:26 -0500 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2016-04-25 14:35:26 -0500 |
| commit | 7f768544c2421c399c0909ad9d5a9f916cd96de3 (patch) | |
| tree | bd8a9fc167ca3ec7e3e6a9e560f37feb9539c14e /drivers/pci/pci.c | |
| parent | 9735a22799b9214d17d3c231fe377fc852f042e9 (diff) | |
| parent | 35a6ae07c663499875309f18730f3440bb59f6fe (diff) | |
| parent | 4d88d5a7bf92e31215543b955b8883dcf6f66c1f (diff) | |
| parent | dcbb408ac5a2803ba44ca2fae8bf53eb5d4082f3 (diff) | |
| parent | b1a928cdb477037fb7c10fbf94c47f65f2bcce77 (diff) | |
| parent | 19bf4d4f909d644110cb587545dc385044ac90a4 (diff) | |
| parent | 1bf2bf229b64540f91ac6fa3af37c81249037a0b (diff) | |
Merge branches 'pci/enumeration', 'pci/hotplug', 'pci/misc', 'pci/ntb', 'pci/thunderbolt' and 'pci/virtualization' into next
* pci/enumeration:
x86/PCI: Refine PCI support check in pcibios_init()
* pci/hotplug:
PCI: acpiphp_ibm: Avoid uninitialized variable reference
* pci/misc:
PCI: Fix spelling errors
* pci/ntb:
PCI: Add DMA alias quirk for mic_x200_dma
PCI: Add support for multiple DMA aliases
PCI: Move informational printk to pci_add_dma_alias()
PCI: Add pci_add_dma_alias() to abstract implementation
* pci/thunderbolt:
thunderbolt: Support 1st gen Light Ridge controller
thunderbolt: Fix typos and magic number
PCI: Add Intel Thunderbolt device IDs
* pci/virtualization:
PCI: Work around Intel Sunrise Point PCH incorrect ACS capability
PCI: Reverse standard ACS vs device-specific ACS enabling
PCI: Mark Intel i40e NIC INTx masking as broken