From: Bjorn Helgaas <bhelgaas@google.com>
Date: Mon, 24 Sep 2012 22:36:48 +0000 (-0600)
Subject: Merge branch 'pci/jiang-acpiphp' into next
X-Git-Tag: firefly_0821_release~3680^2~1981^2~1
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=d3ce52f50cc1697504130897f1d7c489b62dae1c;p=firefly-linux-kernel-4.4.55.git

Merge branch 'pci/jiang-acpiphp' into next
---

d3ce52f50cc1697504130897f1d7c489b62dae1c