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
..
b2c2	Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media	2012-01-15 12:49:56 -08:00
bt8xx	[media] v4l/dvb: fix compiler warnings	2012-05-14 14:50:10 -03:00
ddbridge	[media] drivers/media: add missing __devexit_p() annotations	2012-05-15 07:53:51 -03:00
dm1105	[media] dm1105: release dvbnet on frontend attachment failure	2012-01-07 11:54:03 -02:00
dvb-core	[media] DVB: remove "stats" property bits from ATSC-MH API property additions	2012-05-20 10:06:08 -03:00
dvb-usb	[media] rtl28xxu: add small sleep for rtl2830 demod attach	2012-05-20 10:25:00 -03:00
firewire	Remove all #inclusions of asm/system.h	2012-03-28 18:30:03 +01:00
frontends	Merge branch 'v4l_for_linus' into staging/for_v3.6	2012-06-27 08:57:09 -03:00
mantis	[media] v4l/dvb: fix compiler warnings	2012-05-14 14:50:51 -03:00
ngene	[media] ngene: remove an unneeded condition	2012-04-26 15:29:23 -03:00
pluto2	[media] pluto2: remove some dead code	2012-04-19 17:15:32 -03:00
pt1	[media] dvb: earth-pt1: remove unsupported net subdevices	2012-03-19 15:48:13 -03:00
siano	[media] smsusb: add autodetection support for USB ID 2040:f5a0	2012-06-11 16:12:35 -03:00
ttpci	[media] av7110: fix v4l2_compliance test issues	2012-05-14 15:04:11 -03:00
ttusb-budget	Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media	2012-01-15 12:49:56 -08:00
ttusb-dec	Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media	2012-01-15 12:49:56 -08:00
Kconfig	[media] ddbridge: Allow compiling of the driver	2011-07-27 17:55:45 -03:00
Makefile	[media] ddbridge: Allow compiling of the driver	2011-07-27 17:55:45 -03:00