summaryrefslogtreecommitdiff
path: root/drivers/block
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2014-11-21 20:11:33 +0300
committerBjorn Helgaas <bhelgaas@google.com>2014-11-21 20:11:33 +0300
commit149792795d2bab33954bc025fcf145a8009683f6 (patch)
treeaee13528ef690a64decf22e2c412b15644442a80 /drivers/block
parent18e88beceb1838cfa7cc1a9abf16f5b419e11fdd (diff)
parentf8338694270224970cbaae7e404517ec39f9c753 (diff)
downloadlinux-149792795d2bab33954bc025fcf145a8009683f6.tar.xz
Merge branch 'pci/msi' into next
* pci/msi: s390/MSI: Use __msi_mask_irq() instead of default_msi_mask_irq() Revert "PCI: Add x86_msi.msi_mask_irq() and msix_mask_irq()" PCI/MSI: Add pci_msi_ignore_mask to prevent writes to MSI/MSI-X Mask Bits
Diffstat (limited to 'drivers/block')
0 files changed, 0 insertions, 0 deletions