[mchehab@redhat.com: Fix a merge conflict]
Signed-off-by: NRémi Cardona <remi.cardona@smartjog.com>
Reviewed-by: NAntti Palosaari <crope@iki.fi>
Signed-off-by: NMauro Carvalho Chehab <mchehab@redhat.com>