Merge branch 'android-tegra-2.6.36' into android-tegra-moto-2.6.36
authorDima Zavin <dima@android.com>
Tue, 14 Dec 2010 22:25:27 +0000 (14:25 -0800)
committerDima Zavin <dima@android.com>
Tue, 14 Dec 2010 22:25:27 +0000 (14:25 -0800)
commite8dc57547c9967474431ff1bf4ff1dc5c7cbf737
tree1332fe6fa67e32365ba213a41decf7d24831af1b
parent63414aad4c3aa5658e08aa2a5248867518952448
parent2da4db5bffe757188b0a06235e5e68505a5c20c4
Merge branch 'android-tegra-2.6.36' into android-tegra-moto-2.6.36

Conflicts:
arch/arm/mach-tegra/tegra2_clocks.c

Change-Id: Ia10990fca6221d4d7d0236073910d8c48bf6762b
arch/arm/mach-tegra/Kconfig
arch/arm/mach-tegra/Makefile
arch/arm/mach-tegra/include/mach/iomap.h
arch/arm/mach-tegra/tegra2_clocks.c