Merge branch 'pci/jiang-acpiphp' into next
authorBjorn Helgaas <bhelgaas@google.com>
Mon, 24 Sep 2012 22:36:48 +0000 (16:36 -0600)
committerBjorn Helgaas <bhelgaas@google.com>
Mon, 24 Sep 2012 22:36:48 +0000 (16:36 -0600)
commitd3ce52f50cc1697504130897f1d7c489b62dae1c
treeb91971ad26f7b59c71e775d7e71b9dc89da8e568
parent18d63c35a265465b7137c4ea9c6b135aada13c3c
parent5ba113f7c4fb06cfdd6cba92353ac55ad5b81b75
Merge branch 'pci/jiang-acpiphp' into next
drivers/pci/hotplug/acpiphp_glue.c