diff options
author | Bjorn Helgaas <bhelgaas@google.com> | 2013-01-14 17:25:13 (GMT) |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2013-01-14 17:25:13 (GMT) |
commit | d712f686ced38e248e510cc6b6f9498791f874cc (patch) | |
tree | bb181f33812564bcfc5b3b4e862daec680774276 /fs/nfs/nfs4state.c | |
parent | a82b6af37d20bfe6e99a4d890f1cf1d89059929f (diff) | |
parent | f652e7d2916fe2fcf9e7d709aa5b7476b431e2dd (diff) | |
download | linux-fsl-qoriq-d712f686ced38e248e510cc6b6f9498791f874cc.tar.xz |
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
Diffstat (limited to 'fs/nfs/nfs4state.c')
0 files changed, 0 insertions, 0 deletions