| commit | fcb388ce6c293b36a71a24c0bfe526c13774302a | [log] [tgz] |
|---|---|---|
| author | Mauro Carvalho Chehab <m.chehab@samsung.com> | Tue Jul 22 16:25:33 2014 -0300 |
| committer | Mauro Carvalho Chehab <m.chehab@samsung.com> | Tue Jul 22 20:38:13 2014 -0300 |
| tree | f164b9eed1217d16a1b94d3dea5c20721b2a733f | |
| parent | e23cf7f358554139a7c9f0d2739eec187599c670 [diff] |
[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>