mirror of
https://github.com/torvalds/linux.git
synced 2026-04-18 23:03:57 -04:00
[mchehab@redhat.com: Fix a merge conflict] Signed-off-by: Igor M. Liplianin <liplianin@netup.ru> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>