From: Bjorn Helgaas <bhelgaas@google.com>
Date: Tue, 12 Feb 2013 20:42:36 +0000 (-0700)
Subject: Merge branch 'pci/konstantin-runtime-pm' into next
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=20f24208f631141bafe57ce5bcc8f2e7f3c41aae;p=linux.git

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()
---

20f24208f631141bafe57ce5bcc8f2e7f3c41aae