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

diff --cc arch/arm/mach-tegra/Kconfig
index ef028cd62734e7bb3169f49b07f3741f3a0ad034,cfd34566ef1221037257036f7dd5b4e4f9ea0c94..8269eea7ee7780a50870d8d662387b59fad9a58e
--- 1/arch/arm/mach-tegra/Kconfig
--- 2/arch/arm/mach-tegra/Kconfig
+++ b/arch/arm/mach-tegra/Kconfig
@@@ -66,15 -66,12 +66,19 @@@ 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_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