diff options
author | Bjorn Helgaas <bhelgaas@google.com> | 2014-04-29 17:43:58 -0600 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2014-04-29 17:43:58 -0600 |
commit | 518a6a34f645897ec3440e5cbcf53ced3493ee1c (patch) | |
tree | fa73b263e479845748120c4fedc038e90e424d6d /mm/Kconfig | |
parent | c9eaa447e77efe77b7fa4c953bd62de8297fd6c5 (diff) | |
parent | 761ce53330a4f02c58768631027d1c1dd0d538f7 (diff) | |
parent | a30d0108b09ae46d24594a2e699c4dad21bb4af4 (diff) | |
parent | 1a30fd0dba778f7ef1a6254989060a141fca8e23 (diff) | |
parent | 1e358f94c00570f88a590cabe718daf835440cc9 (diff) |
Merge branches 'pci/hotplug', 'pci/msi', 'pci/virtualization' and 'pci/misc' into next
* pci/hotplug:
PCI: rphahp: Fix endianess issues
PCI: Allow hotplug service drivers to operate in polling mode
PCI: pciehp: Acknowledge spurious "cmd completed" event
PCI: pciehp: Use PCI_EXP_SLTCAP_PSN define
PCI: hotplug: Remove unnecessary "dev->bus" test
* pci/msi:
GenWQE: Use pci_enable_msi_exact() instead of pci_enable_msi_block()
PCI/MSI: Simplify populate_msi_sysfs()
PCI/portdrv: Use pci_enable_msix_exact() instead of pci_enable_msix()
* pci/virtualization:
PCI: Add Patsburg (X79) to Intel PCH root port ACS quirk
* pci/misc:
PCI: Fix use of uninitialized MPS value
PCI: Remove dead code
MAINTAINERS: Add arch/x86/kernel/quirks.c to PCI file patterns
PCI: Remove unnecessary __ref annotations
PCI: Fail new_id for vendor/device values already built into driver
PCI: Add new ID for Intel GPU "spurious interrupt" quirk
PCI: Update my email address
PCI: Fix incorrect vgaarb conditional in WARN_ON()
PCI: Use designated initialization in PCI_VDEVICE
PCI: Remove old serial device IDs
PCI: Remove unnecessary includes of <linux/init.h>
powerpc/PCI: Fix NULL dereference in sys_pciconfig_iobase() list traversal