diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-30 22:03:41 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-30 22:03:41 -0400 |
| commit | 6df419e45d71b8d9a0de8e92a1212bbea460f0e0 (patch) | |
| tree | c0902a96353391400818fe8b7adf11493b56935a /MAINTAINERS | |
| parent | 27c1ee3f929555b71fa39ec0d81a7e7185de1b16 (diff) | |
| parent | c893e7c64e36087dceb4662917976a81d1754fc0 (diff) | |
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
Pull media updates from Mauro Carvalho Chehab:
"This is the first part of the media patches for v3.6.
This patch series contain:
- new DVB frontend: rtl2832
- new video drivers: adv7393
- some unused files got removed
- a selection API cleanup between V4L2 and V4L2 subdev API's
- a major redesign at v4l-ioctl2, in order to clean it up
- several driver fixes and improvements."
* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (174 commits)
v4l: Export v4l2-common.h in include/linux/Kbuild
media: Revert "[media] Terratec Cinergy S2 USB HD Rev.2"
[media] media: Use pr_info not homegrown pr_reg macro
[media] Terratec Cinergy S2 USB HD Rev.2
[media] v4l: Correct conflicting V4L2 subdev selection API documentation
[media] Feature removal: V4L2 selections API target and flag definitions
[media] v4l: Unify selection flags documentation
[media] v4l: Unify selection flags
[media] v4l: Common documentation for selection targets
[media] v4l: Unify selection targets across V4L2 and V4L2 subdev interfaces
[media] v4l: Remove "_ACTUAL" from subdev selection API target definition names
[media] V4L: Remove "_ACTIVE" from the selection target name definitions
[media] media: dvb-usb: print mac address via native %pM
[media] s5p-tv: Use module_i2c_driver in sii9234_drv.c file
[media] media: gpio-ir-recv: add allowed_protos for platform data
[media] s5p-jpeg: Use module_platform_driver in jpeg-core.c file
[media] saa7134: fix spelling of detach in label
[media] cx88-blackbird: replace ioctl by unlocked_ioctl
[media] cx88: don't use current_norm
[media] cx88: fix a number of v4l2-compliance violations
...
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index b2e3d88ff4cd..fb036a062a5d 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -3156,8 +3156,7 @@ S: Maintained | |||
| 3156 | F: drivers/media/video/gspca/t613.c | 3156 | F: drivers/media/video/gspca/t613.c |
| 3157 | 3157 | ||
| 3158 | GSPCA USB WEBCAM DRIVER | 3158 | GSPCA USB WEBCAM DRIVER |
| 3159 | M: Jean-Francois Moine <moinejf@free.fr> | 3159 | M: Hans de Goede <hdegoede@redhat.com> |
| 3160 | W: http://moinejf.free.fr | ||
| 3161 | L: linux-media@vger.kernel.org | 3160 | L: linux-media@vger.kernel.org |
| 3162 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git | 3161 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git |
| 3163 | S: Maintained | 3162 | S: Maintained |