]> bbs.cooldavid.org Git - net-next-2.6.git/commit
git://bbs.cooldavid.org / net-next-2.6.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: be737a8) | patch
V4L/DVB: Fix a merge conflict that affects unlock_ioctl
authorMauro Carvalho Chehab <mchehab@redhat.com>
Sat, 9 Oct 2010 19:43:40 +0000 (16:43 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Thu, 21 Oct 2010 03:16:58 +0000 (01:16 -0200)
commit7242063018c06977dc6825026b3075076e6f227b
tree3d1a33e60443774cf5199c6bc6ee4b76f4d57ac3tree | snapshot (tar.bz2 tar.gz zip)
parentbe737a826949760b75c3b46fc86686274965fca1commit | diff
V4L/DVB: Fix a merge conflict that affects unlock_ioctl

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/media/video/v4l2-dev.c diff | blob | blame | history
Clone of davem's net-next-2.6 tree