Merge branch 'pci/hotplug' into next
authorBjorn Helgaas <bhelgaas@google.com>
Wed, 15 Feb 2017 17:56:09 +0000 (11:56 -0600)
committerBjorn Helgaas <bhelgaas@google.com>
Wed, 15 Feb 2017 17:56:09 +0000 (11:56 -0600)
commit906c142634def5dd3dda533d5d20bd3c1c19d1fb
treefab0c7ee3d97abd856c6cb22570e87a7c9386508
parent63ab93f021ecd815d848c3e9d3e326fa9628e5a9
parent1acf8bca9cdb2443a8707ff0afc3aadbfb5669f4
Merge branch 'pci/hotplug' into next

* pci/hotplug:
  PCI: acpiphp_ibm: Make ibm_apci_table_attr __ro_after_init
  PCI: rpadlpar: Remove unnecessary return statement