From: Bjorn Helgaas <bhelgaas@google.com>
Date: Thu, 15 Aug 2013 20:41:33 +0000 (-0600)
Subject: Merge branch 'pci/aw-reset-v5' into next
X-Git-Tag: v3.12-rc1~177^2~4
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7d8c4a2c5ae6d76f1142fb052d698b3c40ce518c;p=pandora-kernel.git

Merge branch 'pci/aw-reset-v5' into next

* pci/aw-reset-v5:
  PCI: Add pci_probe_reset_slot() and pci_probe_reset_bus()
  PCI: Remove aer_do_secondary_bus_reset()
  PCI: Tune secondary bus reset timing
  PCI: Wake-up devices before saving config space for reset
  PCI: Add pci_reset_slot() and pci_reset_bus()
  PCI: Split out pci_dev lock/unlock and save/restore
  PCI: Add slot reset option to pci_dev_reset()
  PCI: pciehp: Add reset_slot() method
  PCI: Add hotplug_slot_ops.reset_slot()
  PCI: Add pci_reset_bridge_secondary_bus()
---

7d8c4a2c5ae6d76f1142fb052d698b3c40ce518c
Reading git-diff-tree failed