Merge branch 'pci/taku-acpi-pci-host-bridge-v3' into next
authorBjorn Helgaas <bhelgaas@google.com>
Mon, 24 Sep 2012 22:36:10 +0000 (16:36 -0600)
committerBjorn Helgaas <bhelgaas@google.com>
Mon, 24 Sep 2012 22:36:10 +0000 (16:36 -0600)
commit18d63c35a265465b7137c4ea9c6b135aada13c3c
tree1bff6e43ec609a86596d4704f3d50cf0adcfff74
parent168ae6a08aa6e0cf8b0166dedeb675a20af1fbb7
parentcd4faf9c34b27cbb6bcc70a4f1d1759f2e6fa7fd
Merge branch 'pci/taku-acpi-pci-host-bridge-v3' into next
drivers/acpi/pci_root.c
include/linux/acpi.h