merging android-tegra-2.6.36 into git-master/linux-2.6/android-tegra-2.6.36
authorNitin Kumbhar <nkumbhar@nvidia.com>
Wed, 13 Apr 2011 04:52:11 +0000 (10:22 +0530)
committerNitin Kumbhar <nkumbhar@nvidia.com>
Wed, 13 Apr 2011 04:52:11 +0000 (10:22 +0530)
commit9dbff3fcfe2e081db5eca9ba5fedfe83de1c5225
tree2f336c84c7cbc73feb47e7fa3605c86db0c98e20
parenta52b6fbd3e06242edae1ea84368b4291407a91a1
parent0b8bff5ecc4b9077207db4f0adc4a3fdfb70fdb9
merging android-tegra-2.6.36 into git-master/linux-2.6/android-tegra-2.6.36

Conflicts:
drivers/video/tegra/fb.c

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