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

Change-Id: I6fcdbcd0eb7103ac580deb94faf79959a5818ba1

diff --cc drivers/video/tegra/dc/hdmi.c
index dd2a51195880c3c7f66f3ec58cc4462cdc0794b5,cebcdc35d889175ab4a3a63550212824247d1df0..3e274ecb73de32394204ddcaae7f30f425a6ec09
--- 1/drivers/video/tegra/dc/hdmi.c
--- 2/drivers/video/tegra/dc/hdmi.c
+++ b/drivers/video/tegra/dc/hdmi.c
@@@ -456,14 -455,12 +458,17 @@@ static bool tegra_dc_hdmi_detect(struc
        dc->out->h_size = specs.max_x * 1000;
        dc->out->v_size = specs.max_y * 1000;
  
+ 
+       hdmi->dvi = !(specs.misc & FB_MISC_HDMI);
+ 
        tegra_fb_update_monspecs(dc->fb, &specs, tegra_dc_hdmi_mode_filter);
 +      switch_set_state(&hdmi->hpd_switch, 1);
        dev_info(&dc->ndev->dev, "display detected\n");
        return true;
 +
 +fail:
 +      switch_set_state(&hdmi->hpd_switch, 0);
 +      return false;
  }