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

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

diff --cc arch/arm/mach-tegra/Makefile
index 9b8bdf9f56258d089802425e467073a78dbefc97,2223fee1aa9214c7646cc6175304e0a7e76921c1..b2374b94d9eafeca27e7f0a3092063ceb61d5dfd
--- 1/arch/arm/mach-tegra/Makefile
--- 2/arch/arm/mach-tegra/Makefile
+++ b/arch/arm/mach-tegra/Makefile
@@@ -16,8 -16,8 +16,9 @@@ obj-y                                 += tegra_spdif_audio.
  obj-y                                 += mc.o
  obj-$(CONFIG_USB_SUPPORT)               += usb_phy.o
  obj-$(CONFIG_FIQ)                       += fiq.o
 +obj-$(CONFIG_TEGRA_FIQ_DEBUGGER)        += tegra_fiq_debugger.o
  obj-$(CONFIG_TEGRA_PWM)                 += pwm.o
+ obj-$(CONFIG_TEGRA_ARB_SEMAPHORE)     += arb_sema.o
  
  obj-$(CONFIG_ARCH_TEGRA_2x_SOC)         += clock.o
  obj-$(CONFIG_ARCH_TEGRA_2x_SOC)         += tegra2_clocks.o

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