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)
commitd712f686ced38e248e510cc6b6f9498791f874cc
treebb181f33812564bcfc5b3b4e862daec680774276
parenta82b6af37d20bfe6e99a4d890f1cf1d89059929f
parentf652e7d2916fe2fcf9e7d709aa5b7476b431e2dd
Merge branch 'pci/yijing-hotplug-workqueues' into for-linus

* 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