Merge branch 'topic/tegra' into for-linus