Merge branch 'v4l_for_linus' into staging/for_v3.6
authorMauro Carvalho Chehab <mchehab@redhat.com>
Wed, 27 Jun 2012 11:57:09 +0000 (08:57 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Wed, 27 Jun 2012 11:57:09 +0000 (08:57 -0300)
commita99817ca60d206be3645d156f755cf065e949c58
treef95bcc12ba6f3de4181685ffb7042009439599d4
parent81d75e9f56522ed340d7c72471b35ac8e25d823d
parent099987f0aaf28771261b91a41240b9228f2e32b2
Merge branch 'v4l_for_linus' into staging/for_v3.6

* v4l_for_linus: (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()
  ...

Conflicts:
Documentation/DocBook/media/v4l/vidioc-create-bufs.xml
drivers/media/video/em28xx/em28xx-cards.c
drivers/media/video/bt8xx/bttv-driver.c
drivers/media/video/em28xx/em28xx-input.c
drivers/media/video/s5p-fimc/fimc-core.c
include/linux/videodev2.h
sound/i2c/other/tea575x-tuner.c