Merge remote branch 'tegra/linux-tegra-2.6.36' into android-tegra-2.6.36
authorDima Zavin <dima@android.com>
Thu, 11 Nov 2010 23:31:26 +0000 (15:31 -0800)
committerDima Zavin <dima@android.com>
Thu, 11 Nov 2010 23:31:26 +0000 (15:31 -0800)
commit9b95be845359742cfd490c0da670009ff6222496
tree556758276bf06215323e7aacf1e95a69117b2b8a
parent1b7aeb98256b733251847db1750626b710d4fba1
parent240db6a5cb4b846c255e0ae999f406610ab0156c
Merge remote branch 'tegra/linux-tegra-2.6.36' into android-tegra-2.6.36

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

Change-Id: Ia2bd5c56238b9ef0a1eaba3c184c00ea33368263
drivers/video/tegra/dc/hdmi.c