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
..
as102	[media] staging/media/as102: remove version.h include at as102_fe.c	2012-05-20 11:16:45 -03:00
cxd2099
dt3155v4l	[media] v4l2-dev: add flag to have the core lock all file operations	2012-05-14 09:19:38 -03:00
easycap	[media] staging: easycap: Split easycap_delete() into several pieces	2012-05-15 09:00:48 -03:00
go7007	Revert "[media] staging: media: go7007: Adlink MPG24 board issues"	2012-05-20 11:31:51 -03:00
lirc	Merge branch 'v4l_for_linus' into staging/for_v3.6	2012-06-27 08:57:09 -03:00
solo6x10	[media] staging: solo6x10: fix | vs &	2012-06-18 20:08:39 -03:00
Kconfig	[media] staging: Fix comments and some typos in staging/media/*	2012-03-19 14:26:16 -03:00
Makefile