linux-stable/drivers/media/radio/si470x
Mauro Carvalho Chehab a99817ca60 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
2012-06-27 08:57:09 -03:00
..
Kconfig V4L/DVB (12416): radio-si470x: add i2c driver for si470x 2009-09-12 12:18:43 -03:00
Makefile V4L/DVB (12416): radio-si470x: add i2c driver for si470x 2009-09-12 12:18:43 -03:00
radio-si470x-common.c [media] S_HW_FREQ_SEEK: set capability flags and return ENODATA instead of EAGAIN 2012-06-18 20:52:51 -03:00
radio-si470x-i2c.c [media] si470x: Clean up, introduce the control framework 2012-05-14 13:44:02 -03:00
radio-si470x-usb.c [media] radio/si470x: Add support for the Axentia ALERT FM USB Receiver 2012-06-11 16:02:05 -03:00
radio-si470x.h [media] si470x: Clean up, introduce the control framework 2012-05-14 13:44:02 -03:00