Merge branch 'tegra' into for-2.6.40