diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-10-09 23:43:40 +0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-10-21 07:16:58 +0400 |
| commit | 7242063018c06977dc6825026b3075076e6f227b (patch) | |
| tree | 3d1a33e60443774cf5199c6bc6ee4b76f4d57ac3 /include/media/lirc_dev.h | |
| parent | be737a826949760b75c3b46fc86686274965fca1 (diff) | |
| download | linux-7242063018c06977dc6825026b3075076e6f227b.tar.xz | |
V4L/DVB: Fix a merge conflict that affects unlock_ioctl
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'include/media/lirc_dev.h')
0 files changed, 0 insertions, 0 deletions