git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: e23cf7f)
[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)
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>
drivers/media/dvb-frontends/si2168.c patch | blob | history

diff --cc drivers/media/dvb-frontends/si2168.c
Simple merge
Pandora Kernel Repository