]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit1282b790a5af197efa6b343a58585850e28bee44
tree794be65345027b5adea3720a43124fee338333a5
parent341bef3a11f2c6e7223aeea3881bc67bbfc89477
parent2d1f778487b8984f81099e0ffc1341549a1a1545
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