diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2014-05-28 16:21:07 -0600 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2014-05-28 16:21:07 -0600 |
| commit | d1a2523d2adc0b6910dbc2a9aed44c4217134db1 (patch) | |
| tree | 15e88ac80061f8ce24744b65b59858c7b7453420 /drivers/pci | |
| parent | 79d458bf47431675c6b38ea95ecfc31abd502eee (diff) | |
| parent | cab9a128dad0fa0c8400a03d9375c781dda43982 (diff) | |
| parent | 56604faed1121733de58098db51fb5987f2390ee (diff) | |
| parent | 782a985d7af26db39e86070d28f987cad21313c0 (diff) | |
| download | linux-d1a2523d2adc0b6910dbc2a9aed44c4217134db1.tar.bz2 | |
Merge branches 'pci/hotplug', 'pci/pci_is_bridge' and 'pci/virtualization' into next
* pci/hotplug:
PCI: cpqphp: Fix possible null pointer dereference
NVMe: Implement PCIe reset notification callback
PCI: Notify driver before and after device reset
* pci/pci_is_bridge:
pcmcia: Use pci_is_bridge() to simplify code
PCI: pciehp: Use pci_is_bridge() to simplify code
PCI: acpiphp: Use pci_is_bridge() to simplify code
PCI: cpcihp: Use pci_is_bridge() to simplify code
PCI: shpchp: Use pci_is_bridge() to simplify code
PCI: rpaphp: Use pci_is_bridge() to simplify code
sparc/PCI: Use pci_is_bridge() to simplify code
powerpc/PCI: Use pci_is_bridge() to simplify code
ia64/PCI: Use pci_is_bridge() to simplify code
x86/PCI: Use pci_is_bridge() to simplify code
PCI: Use pci_is_bridge() to simplify code
PCI: Add new pci_is_bridge() interface
PCI: Rename pci_is_bridge() to pci_has_subordinate()
* pci/virtualization:
PCI: Introduce new device binding path using pci_dev.driver_override
Conflicts:
drivers/pci/pci-sysfs.c