| commit | 7242063018c06977dc6825026b3075076e6f227b | |
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | |
| Sat, 9 Oct 2010 19:43:40 +0000 (9 16:43 -0300) | ||
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | |
| Thu, 21 Oct 2010 03:16:58 +0000 (21 01:16 -0200) | ||
| tree | 3d1a33e60443774cf5199c6bc6ee4b76f4d57ac3 | treesnapshot (tar.gz zip) |
| parent | be737a826949760b75c3b46fc86686274965fca1 | commitdiff |
V4L/DVB: Fix a merge conflict that affects unlock_ioctl
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
| drivers/media/video/v4l2-dev.c | diffblobblamehistory |