Merge branch 'pci/rafael-pci_set_power_state-rebase' into next
authorBjorn Helgaas <bhelgaas@google.com>
Thu, 5 Jul 2012 22:29:52 +0000 (16:29 -0600)
committerBjorn Helgaas <bhelgaas@google.com>
Thu, 5 Jul 2012 22:29:52 +0000 (16:29 -0600)
commita7711ba1090a5fa1caa6e07182ac4e8e1c0da695
treef5682057d40e557e3816a977fbf9a4762d6716e2
parent85a00dd391d2de1e177c5ad8db5672428934ac20
parentdb288c9c5f9db45610dab3940377625132b4af41
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()
drivers/pci/pci.c
drivers/pci/pci.h