Merge branch 'pci/resource-mmap'