Merge branch 'pci/yijing-hotplug-workqueues' into for-linus
authorBjorn Helgaas <bhelgaas@google.com>
Mon, 14 Jan 2013 17:25:13 +0000 (10:25 -0700)
committerBjorn Helgaas <bhelgaas@google.com>
Mon, 14 Jan 2013 17:25:13 +0000 (10:25 -0700)
* pci/yijing-hotplug-workqueues:
  PCI: shpchp: Use per-slot workqueues to avoid deadlock
  PCI: shpchp: Handle push button event asynchronously
  PCI: shpchp: Make shpchp_wq non-ordered
  PCI: pciehp: Use per-slot workqueues to avoid deadlock


Trivial merge