diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-21 13:01:27 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-21 13:01:27 -0400 |
commit | 0c8027d50c070859314a88aaff42453ff4f71819 (patch) | |
tree | 440ecaefad24571853796df50eb2f238052dd3f2 /MAINTAINERS | |
parent | 1fc149933fd49a5b0e7738dc0853dbfbac4ae0e1 (diff) | |
parent | 64131a87f2aae2ed9e05d8227c5b009ca6c50d98 (diff) |
Merge tag 'media/v4.1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
Pull media updates from Mauro Carvalho Chehab:
- a new frontend driver for new ATSC devices: lgdt3306a
- a new sensor driver: ov2659
- a new platform driver: xilinx
- the m88ts2022 tuner driver was merged at ts2020 driver
- the media controller gained experimental support for DVB and hybrid
devices
- lots of random cleanups, fixes and improvements on media drivers
* tag 'media/v4.1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (404 commits)
[media] uvcvideo: add support for VIDIOC_QUERY_EXT_CTRL
[media] uvcvideo: fix cropcap v4l2-compliance failure
[media] media: omap3isp: remove unused clkdev
[media] coda: Add tracing support
[media] coda: drop dma_sync_single_for_device in coda_bitstream_queue
[media] coda: fix fill bitstream errors in nonstreaming case
[media] coda: call SEQ_END when the first queue is stopped
[media] coda: fail to start streaming if userspace set invalid formats
[media] coda: remove duplicate error messages for buffer allocations
[media] coda: move parameter buffer in together with context buffer allocation
[media] coda: allocate bitstream buffer from REQBUFS, size depends on the format
[media] coda: allocate per-context buffers from REQBUFS
[media] coda: use strlcpy instead of snprintf
[media] coda: bitstream payload is unsigned
[media] coda: fix double call to debugfs_remove
[media] coda: check kasprintf return value in coda_open
[media] coda: bitrate can only be set in kbps steps
[media] v4l2-mem2mem: no need to initialize b in v4l2_m2m_next_buf and v4l2_m2m_buf_remove
[media] s5p-mfc: set allow_zero_bytesused flag for vb2_queue_init
[media] coda: set allow_zero_bytesused flag for vb2_queue_init
...
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 33 |
1 files changed, 22 insertions, 11 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index d4aaab5ea139..1af6b9a9a6d5 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -4474,7 +4474,7 @@ S: Maintained | |||
4474 | F: block/partitions/efi.* | 4474 | F: block/partitions/efi.* |
4475 | 4475 | ||
4476 | STK1160 USB VIDEO CAPTURE DRIVER | 4476 | STK1160 USB VIDEO CAPTURE DRIVER |
4477 | M: Ezequiel Garcia <elezegarcia@gmail.com> | 4477 | M: Ezequiel Garcia <ezequiel@vanguardiasur.com.ar> |
4478 | L: linux-media@vger.kernel.org | 4478 | L: linux-media@vger.kernel.org |
4479 | T: git git://linuxtv.org/media_tree.git | 4479 | T: git git://linuxtv.org/media_tree.git |
4480 | S: Maintained | 4480 | S: Maintained |
@@ -6166,16 +6166,6 @@ Q: http://patchwork.linuxtv.org/project/linux-media/list/ | |||
6166 | S: Maintained | 6166 | S: Maintained |
6167 | F: drivers/media/dvb-frontends/m88rs2000* | 6167 | F: drivers/media/dvb-frontends/m88rs2000* |
6168 | 6168 | ||
6169 | M88TS2022 MEDIA DRIVER | ||
6170 | M: Antti Palosaari <crope@iki.fi> | ||
6171 | L: linux-media@vger.kernel.org | ||
6172 | W: http://linuxtv.org/ | ||
6173 | W: http://palosaari.fi/linux/ | ||
6174 | Q: http://patchwork.linuxtv.org/project/linux-media/list/ | ||
6175 | T: git git://linuxtv.org/anttip/media_tree.git | ||
6176 | S: Maintained | ||
6177 | F: drivers/media/tuners/m88ts2022* | ||
6178 | |||
6179 | MA901 MASTERKIT USB FM RADIO DRIVER | 6169 | MA901 MASTERKIT USB FM RADIO DRIVER |
6180 | M: Alexey Klimov <klimov.linux@gmail.com> | 6170 | M: Alexey Klimov <klimov.linux@gmail.com> |
6181 | L: linux-media@vger.kernel.org | 6171 | L: linux-media@vger.kernel.org |
@@ -6599,6 +6589,7 @@ M: Laurent Pinchart <laurent.pinchart@ideasonboard.com> | |||
6599 | L: linux-media@vger.kernel.org | 6589 | L: linux-media@vger.kernel.org |
6600 | T: git git://linuxtv.org/media_tree.git | 6590 | T: git git://linuxtv.org/media_tree.git |
6601 | S: Maintained | 6591 | S: Maintained |
6592 | F: Documentation/devicetree/bindings/media/i2c/mt9v032.txt | ||
6602 | F: drivers/media/i2c/mt9v032.c | 6593 | F: drivers/media/i2c/mt9v032.c |
6603 | F: include/media/mt9v032.h | 6594 | F: include/media/mt9v032.h |
6604 | 6595 | ||
@@ -8992,6 +8983,16 @@ T: git git://linuxtv.org/mhadli/v4l-dvb-davinci_devices.git | |||
8992 | S: Maintained | 8983 | S: Maintained |
8993 | F: drivers/media/platform/am437x/ | 8984 | F: drivers/media/platform/am437x/ |
8994 | 8985 | ||
8986 | OV2659 OMNIVISION SENSOR DRIVER | ||
8987 | M: Lad, Prabhakar <prabhakar.csengg@gmail.com> | ||
8988 | L: linux-media@vger.kernel.org | ||
8989 | W: http://linuxtv.org/ | ||
8990 | Q: http://patchwork.linuxtv.org/project/linux-media/list/ | ||
8991 | T: git git://linuxtv.org/mhadli/v4l-dvb-davinci_devices.git | ||
8992 | S: Maintained | ||
8993 | F: drivers/media/i2c/ov2659.c | ||
8994 | F: include/media/ov2659.h | ||
8995 | |||
8995 | SIS 190 ETHERNET DRIVER | 8996 | SIS 190 ETHERNET DRIVER |
8996 | M: Francois Romieu <romieu@fr.zoreil.com> | 8997 | M: Francois Romieu <romieu@fr.zoreil.com> |
8997 | L: netdev@vger.kernel.org | 8998 | L: netdev@vger.kernel.org |
@@ -10921,6 +10922,16 @@ L: linux-serial@vger.kernel.org | |||
10921 | S: Maintained | 10922 | S: Maintained |
10922 | F: drivers/tty/serial/uartlite.c | 10923 | F: drivers/tty/serial/uartlite.c |
10923 | 10924 | ||
10925 | XILINX VIDEO IP CORES | ||
10926 | M: Hyun Kwon <hyun.kwon@xilinx.com> | ||
10927 | M: Laurent Pinchart <laurent.pinchart@ideasonboard.com> | ||
10928 | L: linux-media@vger.kernel.org | ||
10929 | T: git git://linuxtv.org/media_tree.git | ||
10930 | S: Supported | ||
10931 | F: Documentation/devicetree/bindings/media/xilinx/ | ||
10932 | F: drivers/media/platform/xilinx/ | ||
10933 | F: include/uapi/linux/xilinx-v4l2-controls.h | ||
10934 | |||
10924 | XILLYBUS DRIVER | 10935 | XILLYBUS DRIVER |
10925 | M: Eli Billauer <eli.billauer@gmail.com> | 10936 | M: Eli Billauer <eli.billauer@gmail.com> |
10926 | L: linux-kernel@vger.kernel.org | 10937 | L: linux-kernel@vger.kernel.org |