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

diff --combined arch/arm/mach-tegra/Kconfig
index e94c092b1560ab31a58a3dcb9a5483ac4a7f2d64,636876fb9e786e2154f2c273be2e1c32f3928113..408fa4bdd53b784d011fe12abb78f6764ee52adb
--- 1/arch/arm/mach-tegra/Kconfig
--- 2/arch/arm/mach-tegra/Kconfig
+++ b/arch/arm/mach-tegra/Kconfig
@@@ -11,6 -11,9 +11,9 @@@ config ARCH_TEGRA_2x_SO
        select ARM_GIC
        select ARCH_REQUIRE_GPIOLIB
        select ARM_ERRATA_742230
+       select USB_ARCH_HAS_EHCI if USB_SUPPORT
+       select USB_ULPI if USB_SUPPORT
+       select USB_ULPI_VIEWPORT if USB_SUPPORT
        help
          Support for NVIDIA Tegra AP20 and T20 processors, based on the
          ARM CortexA9MP CPU and the ARM PL310 L2 cache controller
@@@ -66,13 -69,6 +69,13 @@@ 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