tree fab0c7ee3d97abd856c6cb22570e87a7c9386508
parent 63ab93f021ecd815d848c3e9d3e326fa9628e5a9
parent 1acf8bca9cdb2443a8707ff0afc3aadbfb5669f4
author Bjorn Helgaas <bhelgaas@google.com> 1487181369 -0600
committer Bjorn Helgaas <bhelgaas@google.com> 1487181369 -0600

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