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

diff --cc arch/arm/mach-tegra/Kconfig
index 0bd7b41592be237a775921febe3c80172327367e,6f28e0e73469d72fc78f93191de02a269aa2485a..ef028cd62734e7bb3169f49b07f3741f3a0ad034
--- 1/arch/arm/mach-tegra/Kconfig
--- 2/arch/arm/mach-tegra/Kconfig
+++ b/arch/arm/mach-tegra/Kconfig
@@@ -66,15 -66,17 +66,24 @@@ config TEGRA_PW
        help
          Enable support for the Tegra PWM controller(s).
  
 +config TEGRA_FIQ_DEBUGGER
 +      bool "Enable the FIQ serial debugger on Tegra"
 +      default y
 +      select FIQ_DEBUGGER
 +      help
 +        Enables the FIQ serial debugger on Tegra"
 +
  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