Merge branch 'pci/msi' into next
authorBjorn Helgaas <bhelgaas@google.com>
Fri, 20 Dec 2013 19:41:40 +0000 (12:41 -0700)
committerBjorn Helgaas <bhelgaas@google.com>
Fri, 20 Dec 2013 19:41:40 +0000 (12:41 -0700)
commit47e0ab3f39aec53d9b7ac77dbe11a645e40583f9
tree2d7c413a4bf808851f990416ce75c2c978332323
parentf72e11123ba122c4ed8fcee52ab57cf3fbe81178
parent52179dc9edc3b7a2b3bb01cbb1b6c96f6d05fc73
Merge branch 'pci/msi' into next

* pci/msi:
  PCI/MSI: Make pci_enable_msi/msix() 'nvec' argument type as int
  PCI/MSI: Return -ENOSYS for unimplemented interfaces, not -1
  PCI/MSI: Return msix_capability_init() failure if populate_msi_sysfs() fails
  s390/PCI: Remove superfluous check of MSI type
  s390/PCI: Fix single MSI only check
  PCI/MSI: Export MSI mode using attributes, not kobjects
drivers/pci/msi.c
include/linux/pci.h