Merge branch linux-tegra-2.6.36 into android-tegra-2.6.36