tree 6220d9be56bb9e8dd1154f34905671fbf06d35b1
parent f2dfcde4ccd101fa3ba8f6c27273a0e359ea9c9c
parent 82fee4d67ab86d6fe5eb0f9a9e988ca9d654d765
author Bjorn Helgaas <bhelgaas@google.com> 1360701756 -0700
committer Bjorn Helgaas <bhelgaas@google.com> 1360701756 -0700

Merge branch 'pci/konstantin-runtime-pm' into next

* pci/konstantin-runtime-pm:
  PCI/PM: Clear state_saved during suspend
  PCI: Use atomic_inc_return() rather than atomic_add_return()
  PCI: Catch attempts to disable already-disabled devices
  PCI: Disable Bus Master unconditionally in pci_device_shutdown()