Merge branch 'tegra-arch' into for-2.6.39