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

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

Change-Id: I9716a3c3a89d9a442d662cc402e1e4fdde1c3be4

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