| commit | 7242063018c06977dc6825026b3075076e6f227b | [log] [tgz] |
|---|---|---|
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | Sat Oct 09 16:43:40 2010 -0300 |
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | Thu Oct 21 01:16:58 2010 -0200 |
| tree | 3d1a33e60443774cf5199c6bc6ee4b76f4d57ac3 | |
| parent | be737a826949760b75c3b46fc86686274965fca1 [diff] |
V4L/DVB: Fix a merge conflict that affects unlock_ioctl Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>