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 /fs/libfs.c | |
| parent | 2f419d76599e2fd1a2c2cf31730c80e952201af1 (diff) | |
| parent | 31ff2a5e42f459f36a88afa82244dd3d3285572e (diff) | |
| parent | 615f77511e4fafa9e67a5b84d8d886dde4f297df (diff) | |
| parent | 94e57fea62020dbf6e5d0093eabcd28366e86044 (diff) | |
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