Skip to content
Commit 9454c238 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/msi-affinity' into next

Conflicts:
	drivers/nvme/host/pci.c
parents a04bee82 4ef33685
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment