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
..
em28xx-audio.c	[media] em28xx: Rename AC97 registers to use sound/ac97_codec.h definitions	2012-06-21 11:28:48 -03:00
em28xx-cards.c	[media] em28xx: Improve support for the Terratec Cinergy HTC Stick HD	2012-06-21 14:31:10 -03:00
em28xx-core.c	[media] em28xx: Rename AC97 registers to use sound/ac97_codec.h definitions	2012-06-21 11:28:48 -03:00
em28xx-dvb.c	[media] em28xx: Improve support for the Terratec Cinergy HTC Stick HD	2012-06-21 14:31:10 -03:00
em28xx-i2c.c	[media] em28xx: Add the DRX-K at I2C address 0x29 to the list of known I2C devices	2012-06-21 12:20:22 -03:00
em28xx-input.c	Merge branch 'v4l_for_linus' into staging/for_v3.6	2012-06-27 08:57:09 -03:00
em28xx-reg.h	[media] em28xx: Remove unused AC97 register definitions	2012-06-21 11:29:04 -03:00
em28xx-vbi.c	[media] media: fix em28xx build, needs hardirq.h	2010-12-29 08:17:02 -02:00
em28xx-video.c	[media] em28xx: Fix memory leak on driver defered resource release	2012-05-18 15:51:07 -03:00
em28xx.h	[media] em28xx: Remove unused wait_queue's	2012-05-15 08:07:39 -03:00
Kconfig	[media] em28xx: Make em28xx-input.c a separate module	2012-04-10 20:45:41 -03:00
Makefile	[media] em28xx: Make em28xx-input.c a separate module	2012-04-10 20:45:41 -03:00