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

Change-Id: I6f5240610c57da5fe73951a1727944b5a4ff32db

diff --cc arch/arm/mach-tegra/Makefile
index 869dd4cafdc33b93ecad8bcff960c43f93ebb290,cb2ad3b36582bec5f72745c3af01c6a1438ba59a..29379edaf9759bbc93b6100bff90622c0b3418ed
--- 1/arch/arm/mach-tegra/Makefile
--- 2/arch/arm/mach-tegra/Makefile
+++ b/arch/arm/mach-tegra/Makefile
@@@ -12,9 -12,9 +12,10 @@@ obj-
  obj-y                                 += suspend.o
  obj-y                                 += fuse.o
  obj-y                                 += tegra_i2s_audio.o
+ 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_ARCH_TEGRA_2x_SOC)         += clock.o