Bjorn Helgaas 9454c23852 Merge branch 'pci/msi-affinity' into next ... Conflicts: drivers/nvme/host/pci.c		2016-08-01 12:34:01 -05:00
..
asm	Merge branch 'pci/msi-affinity' into next	2016-08-01 12:34:01 -05:00
uapi/asm	powerpc updates for 4.7	2016-05-20 10:12:41 -07:00