From: Bjorn Helgaas <bhelgaas@google.com>
Date: Thu, 5 Jul 2012 22:29:52 +0000 (-0600)
Subject: Merge branch 'pci/rafael-pci_set_power_state-rebase' into next
X-Git-Tag: v3.6-rc1~112^2~9
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=a7711ba1090a5fa1caa6e07182ac4e8e1c0da695;p=~emulex%2Finfiniband.git

Merge branch 'pci/rafael-pci_set_power_state-rebase' into next

* pci/rafael-pci_set_power_state-rebase:
  PCI / PM: restore the original behavior of pci_set_power_state()
---

a7711ba1090a5fa1caa6e07182ac4e8e1c0da695