Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
Pull media fixes from Mauro Carvalho Chehab. Trivial conflict due to new USB HID ID's being added next to each other (Baanto vs Axentia). * 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (44 commits) [media] smia: Fix compile failures [media] Fix VIDIOC_DQEVENT docbook entry [media] s5p-fimc: Fix control creation function [media] s5p-mfc: Fix checkpatch error in s5p_mfc_shm.h file [media] s5p-mfc: Fix setting controls [media] v4l/s5p-mfc: added image size align in VIDIOC_TRY_FMT [media] v4l/s5p-mfc: corrected encoder v4l control definitions [media] v4l: mem2mem_testdev: Fix race conditions in driver [media] s5p-mfc: Bug fix of timestamp/timecode copy mechanism [media] cxd2820r: Fix an incorrect modulation type bitmask [media] em28xx: Show a warning if the board does not support remote controls [media] em28xx: Add remote control support for Terratec's Cinergy HTC Stick HD [media] USB: Staging: media: lirc: initialize spinlocks before usage [media] Revert "[media] media: mx2_camera: Fix mbus format handling" [media] bw-qcam: driver and pixfmt documentation fixes [media] cx88: fix firmware load on big-endian systems [media] cx18: support big-endian systems [media] ivtv: fix support for big-endian systems [media] tuner-core: return the frequency range of the correct tuner [media] v4l2-dev.c: fix g_parm regression in determine_valid_ioctls() ...
No related branches found
No related tags found
Showing
- Documentation/DocBook/media/v4l/pixfmt.xml 2 additions, 2 deletionsDocumentation/DocBook/media/v4l/pixfmt.xml
- Documentation/DocBook/media/v4l/v4l2.xml 1 addition, 1 deletionDocumentation/DocBook/media/v4l/v4l2.xml
- Documentation/DocBook/media/v4l/vidioc-create-bufs.xml 2 additions, 3 deletionsDocumentation/DocBook/media/v4l/vidioc-create-bufs.xml
- Documentation/DocBook/media/v4l/vidioc-dqevent.xml 1 addition, 1 deletionDocumentation/DocBook/media/v4l/vidioc-dqevent.xml
- arch/arm/plat-mxc/include/mach/mx2_cam.h 2 additions, 0 deletionsarch/arm/plat-mxc/include/mach/mx2_cam.h
- drivers/hid/hid-core.c 1 addition, 0 deletionsdrivers/hid/hid-core.c
- drivers/hid/hid-ids.h 3 additions, 0 deletionsdrivers/hid/hid-ids.h
- drivers/media/common/saa7146_fops.c 0 additions, 5 deletionsdrivers/media/common/saa7146_fops.c
- drivers/media/dvb/frontends/cx24110.c 2 additions, 2 deletionsdrivers/media/dvb/frontends/cx24110.c
- drivers/media/dvb/frontends/cxd2820r_c.c 1 addition, 1 deletiondrivers/media/dvb/frontends/cxd2820r_c.c
- drivers/media/dvb/frontends/lg2160.c 1 addition, 1 deletiondrivers/media/dvb/frontends/lg2160.c
- drivers/media/dvb/siano/smsusb.c 2 additions, 0 deletionsdrivers/media/dvb/siano/smsusb.c
- drivers/media/radio/radio-maxiradio.c 1 addition, 1 deletiondrivers/media/radio/radio-maxiradio.c
- drivers/media/radio/radio-sf16fmr2.c 1 addition, 1 deletiondrivers/media/radio/radio-sf16fmr2.c
- drivers/media/radio/si470x/radio-si470x-usb.c 2 additions, 0 deletionsdrivers/media/radio/si470x/radio-si470x-usb.c
- drivers/media/video/bt8xx/bttv-cards.c 6 additions, 78 deletionsdrivers/media/video/bt8xx/bttv-cards.c
- drivers/media/video/bt8xx/bttv-driver.c 5 additions, 0 deletionsdrivers/media/video/bt8xx/bttv-driver.c
- drivers/media/video/bt8xx/bttv.h 0 additions, 1 deletiondrivers/media/video/bt8xx/bttv.h
- drivers/media/video/bt8xx/bttvp.h 1 addition, 0 deletionsdrivers/media/video/bt8xx/bttvp.h
- drivers/media/video/bw-qcam.c 37 additions, 10 deletionsdrivers/media/video/bw-qcam.c
Loading
Please register or sign in to comment