| commit | 149792795d2bab33954bc025fcf145a8009683f6 | [log] [tgz] |
|---|---|---|
| author | Bjorn Helgaas <bhelgaas@google.com> | Fri Nov 21 10:11:33 2014 -0700 |
| committer | Bjorn Helgaas <bhelgaas@google.com> | Fri Nov 21 10:11:33 2014 -0700 |
| tree | aee13528ef690a64decf22e2c412b15644442a80 | |
| parent | 18e88beceb1838cfa7cc1a9abf16f5b419e11fdd [diff] | |
| parent | f8338694270224970cbaae7e404517ec39f9c753 [diff] |
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