Merge branch 'for-pci-res-alloc'