From: Bjorn Helgaas <bhelgaas@google.com>
Date: Wed, 24 Sep 2014 20:36:11 +0000 (-0600)
Subject: Merge branches 'pci/hotplug', 'pci/initdata' and 'pci/misc' into next
X-Git-Tag: v3.18-rc1~110^2~10
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=783a28ec0bf2c2d560d8004c92919d112a777e55;p=karo-tx-linux.git

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
---

783a28ec0bf2c2d560d8004c92919d112a777e55