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

diff --cc arch/arm/mach-tegra/Makefile
index dc7828a23fd226172dec8eb920435c2bf3a9edfa,70ad2462cb179f73f60ffaf16a0a8b743d5727ef..3d13786352a276c53725418960fa3b7bb43f5864
--- 1/arch/arm/mach-tegra/Makefile
--- 2/arch/arm/mach-tegra/Makefile
+++ b/arch/arm/mach-tegra/Makefile
@@@ -1,7 -1,7 +1,8 @@@
  obj-y                                   += common.o
+ obj-y                                   += apbio.o
  obj-y                                   += io.o
  obj-y                                   += irq.o legacy_irq.o
 +obj-y                                 += syncpt.o
  obj-y                                   += clock.o
  obj-y                                   += dvfs.o
  obj-y                                   += timer.o

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