Merge branch 'pci/msi-affinity' into next
authorBjorn Helgaas <bhelgaas@google.com>
Mon, 1 Aug 2016 17:34:01 +0000 (12:34 -0500)
committerBjorn Helgaas <bhelgaas@google.com>
Mon, 1 Aug 2016 17:34:01 +0000 (12:34 -0500)
commit9454c23852ca6d7aec89fd6fd46a046c323caac3
tree794be65345027b5adea3720a43124fee338333a5
parenta04bee8285a71cdbb9076c3dc38be1f0b9a6b4b3
parent4ef33685aa0957d771e068b60a5f3ca6b47ade1c
Merge branch 'pci/msi-affinity' into next

Conflicts:
drivers/nvme/host/pci.c
MAINTAINERS
drivers/net/ethernet/atheros/alx/main.c
drivers/net/ethernet/intel/e1000e/netdev.c
drivers/usb/host/xhci-pci.c
include/linux/pci.h