]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: e3a9e7b) | patch
[media] si2168: Fix a badly solved merge conflict
authorMauro Carvalho Chehab <m.chehab@samsung.com>
Tue, 22 Jul 2014 19:25:33 +0000 (16:25 -0300)
committerMauro Carvalho Chehab <m.chehab@samsung.com>
Tue, 22 Jul 2014 23:38:13 +0000 (20:38 -0300)
commitbe9e2bc2ae355ce318122b0ba72df732faecb4c8
treef164b9eed1217d16a1b94d3dea5c20721b2a733ftree | snapshot
parente3a9e7b89a762d42e8408a3bfa28a4cb159668e2commit | diff
[media] si2168: Fix a badly solved merge conflict

changeset fb087c9f5161 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>
drivers/media/dvb-frontends/si2168.c diff | blob | history
Linux Kernel Source Tree.