| commit | 472358412b93025b13f39e46008af3ed9541ae2b | [log] [tgz] |
|---|---|---|
| author | Bjorn Helgaas <bhelgaas@google.com> | Fri Jan 15 12:33:29 2016 -0600 |
| committer | Bjorn Helgaas <bhelgaas@google.com> | Fri Jan 15 12:33:29 2016 -0600 |
| tree | c2142ab16ed4f76ead5d665c617c98f871c5cbd7 | |
| parent | c111e8bf6edfead5602aafa2cda937781737d4f9 [diff] | |
| parent | 4058937a40f73d46502f6042f87bc90f99bc36fe [diff] | |
| parent | 47b975d234eac39f3a72e5496d5f6158d8b806d1 [diff] |
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