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

Conflicts:
	drivers/video/tegra/dc/hdmi.c

Change-Id: I10fd2dbcc07d7961dd75e10a2c4de926457c2912

diff --cc arch/arm/mach-tegra/Makefile
Simple merge

diff --cc drivers/video/tegra/dc/hdmi.c
index 3e274ecb73de32394204ddcaae7f30f425a6ec09,8b8afe22254dba45bae5f3ca8fb76210342f19b6..92a12ee448c4f195d030a92495d5f067618412a2
--- 1/drivers/video/tegra/dc/hdmi.c
--- 2/drivers/video/tegra/dc/hdmi.c
+++ b/drivers/video/tegra/dc/hdmi.c
@@@ -467,7 -467,7 +471,8 @@@ static bool tegra_dc_hdmi_detect(struc
        return true;
  
  fail:
 +      switch_set_state(&hdmi->hpd_switch, 0);
+       tegra_nvhdcp_set_plug(hdmi->nvhdcp, 0);
        return false;
  }