diff options
| author | Mauro Carvalho Chehab <m.chehab@samsung.com> | 2014-07-22 16:25:33 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <m.chehab@samsung.com> | 2014-07-22 20:38:13 -0300 |
| commit | fcb388ce6c293b36a71a24c0bfe526c13774302a (patch) | |
| tree | f164b9eed1217d16a1b94d3dea5c20721b2a733f /scripts/objdiff | |
| parent | e23cf7f358554139a7c9f0d2739eec187599c670 (diff) | |
| download | cachepc-linux-fcb388ce6c293b36a71a24c0bfe526c13774302a.tar.gz cachepc-linux-fcb388ce6c293b36a71a24c0bfe526c13774302a.zip | |
[media] si2168: Fix a badly solved merge conflict
changeset a733291d6934 didn't merge the fixes well. It ended by
restoring some bad logic removed there.
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Acked-by: Antti Palosaari <crope@iki.fi>
Reviewed-by: Antti Palosaari <crope@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat (limited to 'scripts/objdiff')
0 files changed, 0 insertions, 0 deletions