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

diff --cc arch/arm/mach-tegra/Kconfig
index 3fd7f6b615a600126f55e6ca08d258845f0dd4c1,8269eea7ee7780a50870d8d662387b59fad9a58e..858f6cf7aa1df2ec67fd554776a8d58f57568c94
--- 1/arch/arm/mach-tegra/Kconfig
--- 2/arch/arm/mach-tegra/Kconfig
+++ b/arch/arm/mach-tegra/Kconfig
@@@ -86,13 -73,12 +86,17 @@@ 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_EMC_SCALING_ENABLE
+       bool "Enable scaling the memory frequency"
+       default n
+ 
  config TEGRA_CPU_DVFS
        bool "Enable voltage scaling on Tegra CPU"
        default y

diff --cc arch/arm/mach-tegra/Makefile
Simple merge

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