]> www.infradead.org Git - users/hch/dma-mapping.git/commitdiff
projects / users / hch / dma-mapping.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fd5e20b 181380b)
Merge branch 'pci/yinghai-root-bus-hotplug' into next
authorBjorn Helgaas <bhelgaas@google.com>
Tue, 19 Feb 2013 18:42:17 +0000 (11:42 -0700)
committerBjorn Helgaas <bhelgaas@google.com>
Tue, 19 Feb 2013 18:42:17 +0000 (11:42 -0700)
* pci/yinghai-root-bus-hotplug:
  PCI/ACPI: Don't cache _PRT, and don't associate them with bus numbers

1  2 
drivers/acpi/pci_root.c patch | diff1 | diff2 | blob | history
drivers/pci/pci-acpi.c patch | diff1 | diff2 | blob | history

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