From: Bjorn Helgaas Date: Mon, 10 Sep 2012 22:35:30 +0000 (-0600) Subject: Merge branch 'pci/oliver-pciehp-resume' into next X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=5aaa71cf12f998e7073e36e8efa45d45656d9ace;p=linux-beck.git Merge branch 'pci/oliver-pciehp-resume' into next * pci/oliver-pciehp-resume: PCI: pciehp: Always implement resume, regardless of pciehp_force param --- 5aaa71cf12f998e7073e36e8efa45d45656d9ace