Linus Torvalds aace99e57c Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media ... Pull media fixes from Mauro Carvalho Chehab. Trivial conflict due to new USB HID ID's being added next to each other (Baanto vs Axentia). * 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (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() ...		2012-06-25 14:53:09 -07: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	ALSA: atmel/ac97c: correct the unexpected behavior when using uninitial value for reset pin	2012-05-11 12:10:04 +02:00
core	ALSA: compress_core: cleanup pointers on stop	2012-06-12 17:55:02 +02:00
drivers	ALSA: snd-aloop - improve the sample copy accurracy	2012-05-15 08:34:38 +02:00
firewire	IEEE 1394 (FireWire) subsystem updates post v3.4:	2012-05-24 12:57:47 -07:00
i2c	[media] snd_tea575x: set_freq: update cached freq to the actual achieved frequency	2012-06-11 16:04:12 -03:00
isa	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2012-05-22 19:22:50 -07:00
mips	ALSA: Convert mips directory to module_platform_driver	2011-11-24 13:03:02 +01:00
oss	sound: sound/oss/msnd_pinnacle.c: add vfrees	2012-04-10 08:41:54 +02:00
parisc
pci	Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media	2012-06-25 14:53:09 -07:00
pcmcia	ALSA: module_param: make bool parameters really bool	2011-12-19 10:34:41 +01:00
ppc	Merge branch 'topic/misc' into for-linus	2012-01-12 09:59:14 +01:00
sh	ALSA: sh: Fix up namespace collision in sh_dac_audio.	2012-05-21 11:31:14 +02:00
soc	ASoC: tegra+wm8903: turn of mic detect when card is removed	2012-06-12 11:38:48 +08:00
sparc	ALSA: module_param: make bool parameters really bool	2011-12-19 10:34:41 +01:00
spi	ALSA: Convert at73c213 to module_spi_driver	2012-01-27 15:18:36 +01:00
synth	sound: Add export.h for THIS_MODULE/EXPORT_SYMBOL where needed	2011-10-31 19:31:22 -04:00
usb	ALSA: 6fire: use NULL instead of 0 for pointer assignment	2012-06-18 09:36:38 +02:00
ac97_bus.c
Kconfig	um: switch to use of drivers/Kconfig	2011-11-02 14:15:41 +01:00
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: allow the unit search until 256 in sound_core.c	2012-05-08 17:27:03 +02:00
sound_firmware.c