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
..
ak4xxx-adda.c	sound: Add module.h to the previously silent sound users	2011-10-31 19:31:21 -04:00
ak4113.c	sound: Add module.h to the previously silent sound users	2011-10-31 19:31:21 -04:00
ak4114.c	sound: Add module.h to the previously silent sound users	2011-10-31 19:31:21 -04:00
ak4117.c	sound: Add module.h to the previously silent sound users	2011-10-31 19:31:21 -04:00
Makefile	ALSA: es1968: add radio (tea575x tuner) support	2011-03-21 12:44:14 +01:00
pt2258.c	sound: Add module.h to the previously silent sound users	2011-10-31 19:31:21 -04:00
tea575x-tuner.c	Merge branch 'v4l_for_linus' into staging/for_v3.6	2012-06-27 08:57:09 -03:00