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)
1  2 
drivers/pci/hotplug/acpiphp_glue.c

Simple merge