]> www.infradead.org Git - linux.git/commitdiff
projects / linux.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c111e8b 4058937 47b975d)
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)
* 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

1  2  3 
drivers/pci/rom.c patch | diff1 | diff2 | diff3 | blob | history

diff --cc drivers/pci/rom.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.