Merge branch android-tegra-2.6.36 into android-tegra-moto-2.6.36

Conflicts:
	drivers/mmc/host/sdhci-tegra.c

Change-Id: I52c329c835d80d868c731b23ca2d9dfad6e6586e

diff --cc arch/arm/mach-tegra/suspend.c
Simple merge

diff --cc arch/arm/mach-tegra/tegra2_clocks.c
Simple merge

diff --cc drivers/mmc/host/sdhci-tegra.c
index 65a671d20e0d153cf803d01387650448034629ff,35ec8e385db8a21e0cefdb24d9e1a714853b6038..9d2d4f64b262c4778fd9be4ab8627294d328e7bc
--- 1/drivers/mmc/host/sdhci-tegra.c
--- 2/drivers/mmc/host/sdhci-tegra.c
+++ b/drivers/mmc/host/sdhci-tegra.c
@@@ -33,7 -35,7 +35,8 @@@
  struct tegra_sdhci_host {
        struct sdhci_host *sdhci;
        struct clk *clk;
 +      struct tegra_sdhci_platform_data *plat;
+       int clk_enabled;
  };
  
  static irqreturn_t carddetect_irq(int irq, void *data)