Merge remote branch 'tegra/linux-tegra-2.6.36' into android-tegra-2.6.36

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

Change-Id: Ia2bd5c56238b9ef0a1eaba3c184c00ea33368263

diff --cc drivers/video/tegra/dc/hdmi.c
index acc3b36ea046977270708a227e1caf6981a9c94e,6ad63ba791a4c7f4b996789b5157346b86d83e34..7e19466d3775d614d0993d8af7c0667019e7fd8b
--- 1/drivers/video/tegra/dc/hdmi.c
--- 2/drivers/video/tegra/dc/hdmi.c
+++ b/drivers/video/tegra/dc/hdmi.c
@@@ -23,7 -23,7 +23,8 @@@
  #include <linux/interrupt.h>
  #include <linux/kernel.h>
  #include <linux/slab.h>
+ #include <linux/spinlock.h>
 +#include <linux/switch.h>
  #include <linux/workqueue.h>
  
  #include <mach/clk.h>
@@@ -54,7 -54,9 +55,11 @@@ struct tegra_dc_hdmi_data 
        struct clk                      *disp1_clk;
        struct clk                      *disp2_clk;
  
 +      struct switch_dev               hpd_switch;
++
+       spinlock_t                      suspend_lock;
+       bool                            suspended;
+       bool                            hpd_pending;
  };
  
  const struct fb_videomode tegra_dc_hdmi_supported_modes[] = {
@@@ -569,10 -600,10 +608,13 @@@ static int tegra_dc_hdmi_init(struct te
        hdmi->clk = clk;
        hdmi->disp1_clk = disp1_clk;
        hdmi->disp2_clk = disp2_clk;
+       hdmi->suspended = false;
+       hdmi->hpd_pending = false;
+       spin_lock_init(&hdmi->suspend_lock);
  
 +      hdmi->hpd_switch.name = "hdmi";
 +      switch_dev_register(&hdmi->hpd_switch);
 +
        dc->out->depth = 24;
  
        tegra_dc_set_outdata(dc, hdmi);