video: tegra: dc: resolve deltas - address past merge issues
authorMark Stadler <mastadler@nvidia.com>
Tue, 14 Aug 2012 20:42:23 +0000 (13:42 -0700)
committerDan Willemsen <dwillemsen@nvidia.com>
Sat, 14 Sep 2013 20:20:20 +0000 (13:20 -0700)
commitb8d7d91950e6e465db7c58af4f281f4e1b1981d0
tree23a88afe7eba4abfbd3fe88102451a66d3141912
parent6d6a93ddc33f326fd8c28cd202b2e3bacb1142a1
video: tegra: dc: resolve deltas - address past merge issues

The transition to 3.4 kernel, behind tegra14x exposed some
unintended changes due to incorrect merge conflict resolutions
throughout 3.1 kernel development.  This change addresses that.

Change-Id: I454439e1a47b7011f48c3247e0d0a07174c2c6c7
Signed-off-by: Mark Stadler <mastadler@nvidia.com>
Reviewed-on: http://git-master/r/123454
Reviewed-by: Automatic_Commit_Validation_User
drivers/video/tegra/dc/dc.c