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)
* pci/rafael-pci_set_power_state-rebase:
  PCI / PM: restore the original behavior of pci_set_power_state()

1  2 
drivers/pci/pci.c
drivers/pci/pci.h

Simple merge
Simple merge