arm: tegra: fb: Fix merge error
authorShashank Sharma <shashanks@nvidia.com>
Fri, 21 Dec 2012 07:20:35 +0000 (12:20 +0530)
committerWinnie Hsu <whsu@nvidia.com>
Fri, 21 Dec 2012 09:25:55 +0000 (01:25 -0800)
commit8bd060e546c9c7f4296caca52ea35a3ccd2c953a
treef48fdbddc6dbb0b8432a76d7052e9ffd5fd6e03e
parent4f8461ffb6746c7f4a2258834afead13bcb29d72
arm: tegra: fb: Fix merge error

Fix manual rebase error

Change-Id: I3b2165488b11bddda271cecdc979341c130def9b
Signed-off-by: Shashank Sharma <shashanks@nvidia.com>
Reviewed-on: http://git-master/r/173554
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Winnie Hsu <whsu@nvidia.com>
drivers/video/tegra/dc/dc.c