From: Bjorn Helgaas <bhelgaas@google.com>
Date: Mon, 1 Aug 2016 17:34:01 +0000 (-0500)
Subject: Merge branch 'pci/msi-affinity' into next
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=9454c23852ca6d7aec89fd6fd46a046c323caac3;p=deliverable%2Flinux.git

Merge branch 'pci/msi-affinity' into next

Conflicts:
	drivers/nvme/host/pci.c
---

9454c23852ca6d7aec89fd6fd46a046c323caac3