From: Bjorn Helgaas <bhelgaas@google.com>
Date: Fri, 21 Nov 2014 17:11:33 +0000 (-0700)
Subject: Merge branch 'pci/msi' into next
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=149792795d2bab33954bc025fcf145a8009683f6;p=linux-beck.git

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
---

149792795d2bab33954bc025fcf145a8009683f6