Merge remote branch 'tegra/android-tegra-2.6.36' into android-tegra-moto-2.6.36
authorDima Zavin <dima@android.com>
Tue, 2 Nov 2010 23:25:53 +0000 (16:25 -0700)
committerDima Zavin <dima@android.com>
Tue, 2 Nov 2010 23:30:03 +0000 (16:30 -0700)
commit01c2254a40132857808be5c021c2f4936c7506d9
tree1ffdeef986826376e3e5a9ad25e343c69d012c72
parentb3acf97b43a5f2274a188fda9d095c559d4cde70
parent3e759e2c910e26e4a76f272e0411ebe1c88e4187
Merge remote branch 'tegra/android-tegra-2.6.36' into android-tegra-moto-2.6.36

Conflicts:
drivers/media/video/tegra/Kconfig
drivers/media/video/tegra/Makefile
arch/arm/mach-tegra/Makefile
drivers/media/video/tegra/Kconfig
drivers/media/video/tegra/Makefile