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

Conflicts:
	arch/arm/mach-tegra/Kconfig

Change-Id: I65b3fafd22be87f9a93cae2d225dd24c174eb7a9

diff --cc arch/arm/mach-tegra/Kconfig
index 67b93134472224483fb9cec38a410cda64b9f5de,0bd7b41592be237a775921febe3c80172327367e..f89ae1c5795ac089366d45d7b2cc961ee86395b7
--- 1/arch/arm/mach-tegra/Kconfig
--- 2/arch/arm/mach-tegra/Kconfig
+++ b/arch/arm/mach-tegra/Kconfig
@@@ -79,13 -66,13 +79,20 @@@ 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"
+ 
 +config WIFI_CONTROL_FUNC
 +      bool "Enable WiFi control function abstraction"
 +      help
 +        Enables Power/Reset/Carddetect function abstraction
 +
 +source "arch/arm/mach-tegra/nv/Kconfig"
 +
  endif
  
  config TEGRA_IOVMM_GART

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