diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-26 20:16:20 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-26 20:16:20 -0500 |
| commit | 2b8c70b2174402ca3dec13310ce56597233392d7 (patch) | |
| tree | 0aed464521a2a671cbb7b4302b55fe72abc95d3d /MAINTAINERS | |
| parent | 29e1fa3565a7951cc415c634eb2b78dbdbee151d (diff) | |
| parent | 3621263a4d9679726b7bc1e2546c1c03941a59b4 (diff) | |
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6
* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (362 commits)
V4L-DVB: cx88-dvb: remove extra attribution for core
V4L/DVB: v4l: soc_camera: fix bound checking of mbus_fmt[] index
V4L/DVB: Add support for SMT7020 to cx88
V4L/DVB: radio-si470x: Use UTF-8 encoding on a comment
V4L/DVB: MAINTAINERS: Telegent tlg2300 section fix
V4L/DVB: gspca_stv06xx: Add support for camera button
V4L/DVB: gspca_ov519: add support for the button on ov511 based cams
V4L/DVB: gspca_ov519: Add support for the button on ov518 based cams
V4L/DVB: gspca_ov519: add support for the button on ov519 based cams
V4L/DVB: gspca_main: Fix a compile error when CONFIG_INPUT is not set
V4L/DVB: gspca_main: some input error handling fixes
V4L/DVB: gspca_main: Allow use of input device creation code for non int. inputs
V4L/DVB: gspca_pac7302: much improved exposure control
V4L/DVB: gspca_sonixb: Make sonixb driver handle pas106 and pas202 cameras
V4L/DVB: gspca_sonixb: pas106: fixup bright ctrl and add gain and exposure ctrls
V4L/DVB: Documentation: gspca.txt: update known mr97310a cams
V4L/DVB: gspca_mr97310a: add support for the Sakar 1638x CyberPix
V4L/DVB: gscpa_sonixb: limit ov7630 max framerate at 640x480
V4L/DVB: gspca_sonixb: pas202: fixup brightness ctrl and add gain and exposure ctrls
V4L/DVB: gscpa_sonixb: Differentiate between sensors with a coarse and fine expo ctrl
...
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 563a4c0bf97b..5f8c20600e20 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -4693,6 +4693,13 @@ F: drivers/media/common/saa7146* | |||
| 4693 | F: drivers/media/video/*7146* | 4693 | F: drivers/media/video/*7146* |
| 4694 | F: include/media/*7146* | 4694 | F: include/media/*7146* |
| 4695 | 4695 | ||
| 4696 | TLG2300 VIDEO4LINUX-2 DRIVER | ||
| 4697 | M: Huang Shijie <shijie8@gmail.com> | ||
| 4698 | M: Kang Yong <kangyong@telegent.com> | ||
| 4699 | M: Zhang Xiaobing <xbzhang@telegent.com> | ||
| 4700 | S: Supported | ||
| 4701 | F: drivers/media/video/tlg2300 | ||
| 4702 | |||
| 4696 | SC1200 WDT DRIVER | 4703 | SC1200 WDT DRIVER |
| 4697 | M: Zwane Mwaikambo <zwane@arm.linux.org.uk> | 4704 | M: Zwane Mwaikambo <zwane@arm.linux.org.uk> |
| 4698 | S: Maintained | 4705 | S: Maintained |