Merge branch 'tegra/cleanups' into next/timer