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

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

Change-Id: Id44ce43b0c17f1f3e917b8c7ebfd213790e8e0e1

diff --cc arch/arm/mach-tegra/Kconfig
index 1197a84e4191df0b51297c81f8035c29c02b09cf,ef028cd62734e7bb3169f49b07f3741f3a0ad034..3fd7f6b615a600126f55e6ca08d258845f0dd4c1
--- 1/arch/arm/mach-tegra/Kconfig
--- 2/arch/arm/mach-tegra/Kconfig
+++ b/arch/arm/mach-tegra/Kconfig
@@@ -86,13 -73,17 +86,22 @@@ config TEGRA_FIQ_DEBUGGE
        help
          Enables the FIQ serial debugger on Tegra"
  
 +config WIFI_CONTROL_FUNC
 +      bool "Enable WiFi control function abstraction"
 +      help
 +        Enables Power/Reset/Carddetect function abstraction
 +
  endif
  
+ config TEGRA_CPU_DVFS
+       bool "Enable voltage scaling on Tegra CPU"
+       default y
+ 
+ config TEGRA_CORE_DVFS
+       bool "Enable voltage scaling on Tegra core"
+       depends on TEGRA_CPU_DVFS
+       default y
+ 
  config TEGRA_IOVMM_GART
        bool "Enable I/O virtual memory manager for GART"
        depends on ARCH_TEGRA_2x_SOC

diff --cc drivers/mmc/host/sdhci-tegra.c
index 65a671d20e0d153cf803d01387650448034629ff,19f522d3a59f7145bd0c624cb1f7c97baa64c013..635dced2e82b6fc1d6f2e91c70ab02bd1b9c9eb7
--- 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)