Merge remote branch 'tegra/android-tegra-2.6.36' into android-tegra-moto-2.6.36
authorDima Zavin <dima@android.com>
Mon, 8 Nov 2010 08:04:30 +0000 (00:04 -0800)
committerDima Zavin <dima@android.com>
Mon, 8 Nov 2010 08:04:30 +0000 (00:04 -0800)
commit156efc3e2da7243975d4c4145e212a6b1d85704d
treec9fef50e120a2e3f9488d66768ea3737358b6172
parent52a12a70ddae648b86a7859cacba0d6f69da3f3b
parent5d47678687e0a266e701ad26b4619a2ed97705ac
Merge remote branch 'tegra/android-tegra-2.6.36' into android-tegra-moto-2.6.36

Conflicts:
arch/arm/mach-tegra/devices.h
arch/arm/mach-tegra/include/mach/iomap.h

Change-Id: I4c37389a3ac359b274bf4b45d7a1fb8cfae8c1f9
arch/arm/mach-tegra/tegra2_clocks.c
drivers/media/video/tegra/Kconfig
drivers/media/video/tegra/Makefile