Merge branches 'pci/hotplug' and 'pci/resource' into next
authorBjorn Helgaas <bhelgaas@google.com>
Fri, 15 Jan 2016 18:33:29 +0000 (12:33 -0600)
committerBjorn Helgaas <bhelgaas@google.com>
Fri, 15 Jan 2016 18:33:29 +0000 (12:33 -0600)
commit472358412b93025b13f39e46008af3ed9541ae2b
treec2142ab16ed4f76ead5d665c617c98f871c5cbd7
parentc111e8bf6edfead5602aafa2cda937781737d4f9
parent4058937a40f73d46502f6042f87bc90f99bc36fe
parent47b975d234eac39f3a72e5496d5f6158d8b806d1
Merge branches 'pci/hotplug' and 'pci/resource' into next

* pci/hotplug:
  PCI: ibmphp: Remove unneeded NULL test
  PCI: hotplug: Use list_for_each_entry() to simplify code
  PCI: acpiphp_ibm: Fix null dereferences on null ibm_slot

* pci/resource:
  PCI: Avoid iterating through memory outside the resource window
  PCI: Fix minimum allocation address overwrite
drivers/pci/rom.c