From: Bjorn Helgaas <bhelgaas@google.com>
Date: Wed, 15 Feb 2017 17:56:09 +0000 (-0600)
Subject: Merge branch 'pci/hotplug' into next
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=906c142634def5dd3dda533d5d20bd3c1c19d1fb;p=openwrt%2Fstaging%2Fblogic.git

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

906c142634def5dd3dda533d5d20bd3c1c19d1fb