From: Bjorn Helgaas <bhelgaas@google.com>
Date: Fri, 15 Jan 2016 18:33:29 +0000 (-0600)
Subject: Merge branches 'pci/hotplug' and 'pci/resource' into next
X-Git-Tag: v4.5-rc1~33^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=472358412b93025b13f39e46008af3ed9541ae2b;p=thirdparty%2Fkernel%2Flinux.git

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

472358412b93025b13f39e46008af3ed9541ae2b