diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-24 13:24:52 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-24 13:24:52 -0500 |
commit | c20137fc5329eaf24093fc48c52608dc66be8e5c (patch) | |
tree | b6921a20df62076e3cb67d140e46f7056f139a5d /MAINTAINERS | |
parent | 1806f826554efd206cebacc7f9f213c8e6493a5d (diff) | |
parent | 231ffc9c07021afcfb1afa229aa4935730e5163b (diff) |
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6:
V4L/DVB (9920): em28xx: fix NULL pointer dereference in call to VIDIOC_INT_RESET command
V4L/DVB (9908a): MAINTAINERS: mark linux-uvc-devel as subscribers only
V4L/DVB (9906): v4l2-compat: test for unlocked_ioctl as well.
V4L/DVB (9885): drivers/media Kconfig's: fix bugzilla #12204
V4L/DVB (9875): gspca - main: Fix vidioc_s_jpegcomp locking.
V4L/DVB (9781): [PATCH] Cablestar 2 I2C retries (fix CableStar2 support)
V4L/DVB (9780): dib0700: Stop repeating after user stops pushing button
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index c42a567e010..fbc8fa58d56 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -4529,7 +4529,7 @@ S: Maintained | |||
4529 | USB VIDEO CLASS | 4529 | USB VIDEO CLASS |
4530 | P: Laurent Pinchart | 4530 | P: Laurent Pinchart |
4531 | M: laurent.pinchart@skynet.be | 4531 | M: laurent.pinchart@skynet.be |
4532 | L: linux-uvc-devel@lists.berlios.de | 4532 | L: linux-uvc-devel@lists.berlios.de (subscribers-only) |
4533 | L: video4linux-list@redhat.com | 4533 | L: video4linux-list@redhat.com |
4534 | W: http://linux-uvc.berlios.de | 4534 | W: http://linux-uvc.berlios.de |
4535 | S: Maintained | 4535 | S: Maintained |