From: Bjorn Helgaas Date: Mon, 24 Sep 2012 22:36:48 +0000 (-0600) Subject: Merge branch 'pci/jiang-acpiphp' into next X-Git-Tag: v3.7-rc1~177^2~1 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=d3ce52f50cc1697504130897f1d7c489b62dae1c;p=users%2Fwilly%2Fxarray.git Merge branch 'pci/jiang-acpiphp' into next --- d3ce52f50cc1697504130897f1d7c489b62dae1c