tree 794be65345027b5adea3720a43124fee338333a5
parent a04bee8285a71cdbb9076c3dc38be1f0b9a6b4b3
parent 4ef33685aa0957d771e068b60a5f3ca6b47ade1c
author Bjorn Helgaas <bhelgaas@google.com> 1470072841 -0500
committer Bjorn Helgaas <bhelgaas@google.com> 1470072841 -0500

Merge branch 'pci/msi-affinity' into next

Conflicts:
	drivers/nvme/host/pci.c