Merge branch 'pci/layerscape'