Linus Torvalds aace99e57c 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()
  ...
2012-06-25 14:53:09 -07:00
..
2011-03-31 11:26:23 -03:00
2009-01-21 15:12:40 +01:00
2011-08-17 00:53:54 +09:00
2011-05-19 14:10:45 -07:00
2012-04-30 23:36:20 +01:00
2011-03-31 11:26:23 -03:00
2005-04-16 15:20:36 -07:00
2005-04-16 15:20:36 -07:00
2010-05-10 09:49:30 +02:00
2008-01-31 17:29:13 +01:00
2010-12-01 12:14:47 +01:00
2011-03-31 11:26:23 -03:00
2009-02-05 09:17:50 +01:00
2006-03-22 10:24:57 +01:00
2012-01-03 22:54:56 -05:00
2011-09-22 11:19:20 +02:00
2011-12-31 17:53:52 +01:00
2008-11-17 11:45:39 +00:00
2010-10-18 16:46:27 -07:00
2011-02-14 17:10:11 +01:00
2006-01-03 12:18:06 +01:00
2011-07-26 17:21:24 +02:00
2012-03-18 18:22:37 +01:00
2005-04-16 15:20:36 -07:00
2012-04-26 17:48:42 +01:00
2012-04-26 17:48:42 +01:00
2012-01-25 10:19:35 +01:00
2010-02-12 10:31:06 +00:00
2012-01-26 16:07:55 +00:00
2011-09-20 16:02:16 +01:00
2009-12-18 13:06:47 +00:00
2011-08-08 14:30:37 +09:00
2010-04-30 16:12:44 +01:00
2009-11-05 18:10:25 +01:00