summaryrefslogtreecommitdiffstats
path: root/drivers/ata
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2013-02-12 21:42:36 +0100
committerBjorn Helgaas <bhelgaas@google.com>2013-02-12 21:42:36 +0100
commit20f24208f631141bafe57ce5bcc8f2e7f3c41aae (patch)
tree6220d9be56bb9e8dd1154f34905671fbf06d35b1 /drivers/ata
parentMerge branch 'pci/misc' into next (diff)
parentPCI/PM: Clear state_saved during suspend (diff)
downloadlinux-20f24208f631141bafe57ce5bcc8f2e7f3c41aae.tar.xz
linux-20f24208f631141bafe57ce5bcc8f2e7f3c41aae.zip
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()
Diffstat (limited to 'drivers/ata')
0 files changed, 0 insertions, 0 deletions