diff options
| author |   Bjorn Helgaas <bhelgaas@google.com> | 2014-09-24 14:36:11 -0600 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2014-09-24 14:36:11 -0600 |
| commit | 783a28ec0bf2c2d560d8004c92919d112a777e55 (patch) | |
| tree | cb8b41fbc0a991c4481f090f8791f58d3983d071 /tools/perf/scripts/python/call-graph-from-postgresql.py | |
| parent | Merge branch 'pci/hotplug' into next (diff) | |
| parent | PCI: pciehp: Stop disabling notifications during init (diff) | |
| parent | x86/PCI: Mark PCI BIOS initialization code as such (diff) | |
| parent | PCI: Move PCI_VENDOR_ID_VMWARE to pci_ids.h (diff) | |
| download | linux-dev-783a28ec0bf2c2d560d8004c92919d112a777e55.tar.xz linux-dev-783a28ec0bf2c2d560d8004c92919d112a777e55.zip | |
Merge branches 'pci/hotplug', 'pci/initdata' and 'pci/misc' into next
* pci/hotplug:
PCI: pciehp: Stop disabling notifications during init
PCI: pciehp: Add more Slot Control debug output
PCI: pciehp: Fix wait time in timeout message
* pci/initdata:
x86/PCI: Mark PCI BIOS initialization code as such
x86/PCI: Constify pci_mmcfg_probes[] array
x86/PCI: Mark constants of pci_mmcfg_nvidia_mcp55() as __initconst
x86/PCI: Move __init annotation to the correct place
x86/PCI: Mark DMI tables as initialization data
* pci/misc:
PCI: Move PCI_VENDOR_ID_VMWARE to pci_ids.h