Merge branches 'for-2.6.38' and 'tegra-arch' into for-2.6.39