Re: [PATCH] si2168: Fix a badly solved merge conflict

2014-07-22 Thread Antti Palosaari
Acked-by: Antti Palosaari Reviewed-by: Antti Palosaari Could you merge it directly from patchwork. regards Antti On 07/22/2014 10:25 PM, Mauro Carvalho Chehab wrote: changeset a733291d6934 didn't merge the fixes well. It ended by restoring some bad logic removed there. Signed-off-by: Mauro

[PATCH] si2168: Fix a badly solved merge conflict

2014-07-22 Thread Mauro Carvalho Chehab
changeset a733291d6934 didn't merge the fixes well. It ended by restoring some bad logic removed there. Signed-off-by: Mauro Carvalho Chehab --- drivers/media/dvb-frontends/si2168.c | 14 -- 1 file changed, 14 deletions(-) diff --git a/drivers/media/dvb-frontends/si2168.c b/drivers