diff options
| author | Shashank Sharma <shashanks@nvidia.com> | 2012-12-21 12:50:35 +0530 |
|---|---|---|
| committer | Winnie Hsu <whsu@nvidia.com> | 2012-12-21 01:25:55 -0800 |
| commit | 8bd060e546c9c7f4296caca52ea35a3ccd2c953a (patch) | |
| tree | f48fdbddc6dbb0b8432a76d7052e9ffd5fd6e03e /drivers/video/pxafb.h | |
| parent | 4f8461ffb6746c7f4a2258834afead13bcb29d72 (diff) | |
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>
Diffstat (limited to 'drivers/video/pxafb.h')
0 files changed, 0 insertions, 0 deletions