| commit | 20f24208f631141bafe57ce5bcc8f2e7f3c41aae | [log] [tgz] |
|---|---|---|
| author | Bjorn Helgaas <bhelgaas@google.com> | Tue Feb 12 13:42:36 2013 -0700 |
| committer | Bjorn Helgaas <bhelgaas@google.com> | Tue Feb 12 13:42:36 2013 -0700 |
| tree | 6220d9be56bb9e8dd1154f34905671fbf06d35b1 | |
| parent | f2dfcde4ccd101fa3ba8f6c27273a0e359ea9c9c [diff] | |
| parent | 82fee4d67ab86d6fe5eb0f9a9e988ca9d654d765 [diff] |
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()