From: Bjorn Helgaas Date: Wed, 15 Feb 2017 17:56:09 +0000 (-0600) Subject: Merge branch 'pci/hotplug' into next X-Git-Tag: v4.11-rc1~92^2~22 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=906c142634def5dd3dda533d5d20bd3c1c19d1fb;p=linux.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