diff options
author | Mauro Carvalho Chehab | 2010-10-09 21:43:40 +0200 |
---|---|---|
committer | Mauro Carvalho Chehab | 2010-10-21 05:16:58 +0200 |
commit | 7242063018c06977dc6825026b3075076e6f227b (patch) | |
tree | 3d1a33e60443774cf5199c6bc6ee4b76f4d57ac3 /include | |
parent | V4L/DVB: tm6000: Fix warnings due to a small array size (diff) | |
download | kernel-qcow2-linux-7242063018c06977dc6825026b3075076e6f227b.tar.gz kernel-qcow2-linux-7242063018c06977dc6825026b3075076e6f227b.tar.xz kernel-qcow2-linux-7242063018c06977dc6825026b3075076e6f227b.zip |
V4L/DVB: Fix a merge conflict that affects unlock_ioctl
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions