projects / platform / kernel / linux-3.10.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f2dfcde 82fee4d)
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)
* 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()

1  2 
drivers/pci/pci-driver.c patch | diff1 | diff2 | blob | history
drivers/pci/pci.c patch | diff1 | diff2 | blob | history

diff --cc drivers/pci/pci-driver.c
Simple merge
diff --cc drivers/pci/pci.c
Simple merge
Domain: System / Kernel;