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
..
aoa	ALSA: aoa: Convert onyx and tas codec drivers to module_i2c_driver	2012-01-27 15:18:28 +01:00
arm	ARM: cleanups of io includes	2012-03-29 18:02:10 -07:00
atmel	dmaengine/dw_dmac: Fix dw_dmac user drivers to adapt to slave_config changes	2012-02-22 18:15:39 +05:30
core	ALSA: fix core/vmaster.c kernel-doc warning	2012-04-18 07:56:15 +02:00
drivers	Documentation: remove references to /etc/modprobe.conf	2012-03-30 16:03:15 -07:00
firewire	IEEE 1394 (FireWire) subsystem updates post v3.3:	2012-03-22 20:31:15 -07:00
i2c	Merge branch 'v4l_for_linus' into staging/for_v3.6	2012-06-27 08:57:09 -03:00
isa	ALSA: sound/isa/sscape.c: add missing resource-release code	2012-04-10 08:42:07 +02:00
mips
oss	sound: sound/oss/msnd_pinnacle.c: add vfrees	2012-04-10 08:41:54 +02:00
parisc
pci	[media] snd_tea575x: Make the module using snd_tea575x the fops owner	2012-06-11 16:02:54 -03:00
pcmcia
ppc	Merge branch 'topic/misc' into for-linus	2012-01-12 09:59:14 +01:00
sh
soc	sound fixes for 3.4-rc7	2012-05-10 09:26:58 -07:00
sparc
spi	ALSA: Convert at73c213 to module_spi_driver	2012-01-27 15:18:36 +01:00
synth
usb	Merge branch 'topic/misc' into for-linus	2012-03-18 18:22:33 +01:00
ac97_bus.c
Kconfig
last.c	ALSA: workaround: change the timing of alsa_sound_last_init()	2012-04-19 13:51:54 +02:00
Makefile
sound_core.c
sound_firmware.c