Merge branch 'pci/tegra'