]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
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)
* pci/hotplug:
  PCI: acpiphp_ibm: Make ibm_apci_table_attr __ro_after_init
  PCI: rpadlpar: Remove unnecessary return statement


Trivial merge