]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'pci/konstantin-runtime-pm' into next
authorBjorn Helgaas <bhelgaas@google.com>
Tue, 12 Feb 2013 20:42:36 +0000 (13:42 -0700)
committerBjorn Helgaas <bhelgaas@google.com>
Tue, 12 Feb 2013 20:42:36 +0000 (13:42 -0700)
commit48cf821b1c00f3b8dcc6def731225bf0019d2474
tree6220d9be56bb9e8dd1154f34905671fbf06d35b1
parent904bd25e064c576930bff4df803692ea9ed95da8
parent82f760a7bb08a73c4c74ce3b4cd93caab572ef2a
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()
drivers/pci/pci-driver.c
drivers/pci/pci.c