diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-18 20:03:51 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-18 20:03:51 -0400 |
commit | 19c5abcb74b712a7824ae7c55862932534e7dfec (patch) | |
tree | 006822aa663cb9ee886773e819d4793fe3947626 /MAINTAINERS | |
parent | 675e0655c12209ba1f40af0dff7cd76b17a1315c (diff) | |
parent | aff093d4bbca91f543e24cde2135f393b8130f4b (diff) |
Merge tag 'media/v4.7-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
Pull media updates from Mauro Carvalho Chehab:
- added support for Intersil/Techwell TW686x-based video capture cards
- v4l PCI skeleton driver moved to samples directory
- Documentation cleanups and improvements
- RC: reduced the memory footprint for IR raw events
- tpg: Export the tpg code from vivid as a module
- adv7180: Add device tree binding documentation
- lots of driver improvements and fixes
* tag 'media/v4.7-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (173 commits)
[media] exynos-gsc: avoid build warning without CONFIG_OF
[media] samples: v4l: from Documentation to samples directory
[media] dib0700: add USB ID for another STK8096-PVR ref design based card
[media] tvp5150: propagate I2C write error in .s_register callback
[media] tvp5150: return I2C write operation failure to callers
[media] em28xx: add support for Hauppauge WinTV-dualHD DVB tuner
[media] em28xx: add missing USB IDs
[media] update cx23885 and em28xx cardlists
[media] media: au0828 fix au0828_v4l2_device_register() to not unlock and free
[media] c8sectpfe: Rework firmware loading mechanism
[media] c8sectpfe: Demote print to dev_dbg
[media] c8sectpfe: Fix broken circular buffer wp management
[media] media-device: Simplify compat32 logic
[media] media: i2c: ths7303: remove redundant assignment on bt
[media] dvb-usb: hide unused functions
[media] xilinx-vipp: remove unnecessary of_node_put
[media] drivers/media/media-devnode: clear private_data before put_device()
[media] drivers/media/media-device: move debug log before _devnode_unregister()
[media] drivers/media/rc: postpone kfree(rc_dev)
[media] media/dvb-core: forward media_create_pad_links() return value
...
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index c7dd1a3401e5..add406a46231 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -11338,6 +11338,14 @@ W: https://linuxtv.org | |||
11338 | S: Odd Fixes | 11338 | S: Odd Fixes |
11339 | F: drivers/media/pci/tw68/ | 11339 | F: drivers/media/pci/tw68/ |
11340 | 11340 | ||
11341 | TW686X VIDEO4LINUX DRIVER | ||
11342 | M: Ezequiel Garcia <ezequiel@vanguardiasur.com.ar> | ||
11343 | L: linux-media@vger.kernel.org | ||
11344 | T: git git://linuxtv.org/media_tree.git | ||
11345 | W: http://linuxtv.org | ||
11346 | S: Maintained | ||
11347 | F: drivers/media/pci/tw686x/ | ||
11348 | |||
11341 | TPM DEVICE DRIVER | 11349 | TPM DEVICE DRIVER |
11342 | M: Peter Huewe <peterhuewe@gmx.de> | 11350 | M: Peter Huewe <peterhuewe@gmx.de> |
11343 | M: Marcel Selhorst <tpmdd@selhorst.net> | 11351 | M: Marcel Selhorst <tpmdd@selhorst.net> |