Merge remote-tracking branch 'experimental/dev/android-t114-3.4-rebased' into android...
Varun Wadekar [Fri, 31 Aug 2012 07:28:23 +0000 (12:28 +0530)]
this is part of the merge from main to dev-t114 from main-jb-2012.08.30-B4

Change-Id: I7c2e7e2d84fa37d5de754ed2f5eace7ccac37519

1  2 
arch/arm/configs/tegra3_android_defconfig
arch/arm/mach-tegra/Makefile

Simple merge