Merge branch linux-tegra-2.6.36 into android-tegra-2.6.36
authorErik Gilling <konkers@android.com>
Fri, 25 Feb 2011 01:13:10 +0000 (17:13 -0800)
committerErik Gilling <konkers@android.com>
Fri, 25 Feb 2011 01:13:10 +0000 (17:13 -0800)
commit56edb8f957edbfe32739a5c709bf8f587be52724
treedde05e7b8c912cbc1f7d6e1d665c91a376eb3474
parenta5856ce00674aa34a38a55dd6960638182604d91
parent1249163215ede23cb139a6da9f69e19a393e70f4
Merge branch linux-tegra-2.6.36 into android-tegra-2.6.36

Conflicts:
drivers/video/tegra/dc/hdmi.c

Change-Id: I10fd2dbcc07d7961dd75e10a2c4de926457c2912
arch/arm/mach-tegra/Makefile
drivers/video/tegra/dc/hdmi.c