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
..
devices	ARM: driver specific updates	2012-03-27 16:41:24 -07:00
include/mach	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
3ds_debugboard.c	ARM: 3ds_debugboard: Fix smsc911x driver probe	2012-04-02 11:15:15 +02:00
avic.c	ARM: Remove redundant ';' from avic_irq_set_priority()	2012-02-27 10:15:49 +01:00
clock.c	ARM i.MX: prepare for common clock framework	2012-04-25 17:03:46 +02:00
cpu.c	ARM: mx3: Setup AIPS registers	2012-03-02 08:49:37 +01:00
cpufreq.c	arm/imx: fix cpufreq section mismatch	2011-12-19 12:26:05 +01:00
devices.c	Merge branch 'next/cleanup' of git://git.linaro.org/people/arnd/arm-soc	2011-11-01 20:11:00 -07:00
epit.c	ARM i.MX: remove now unnecessary argument from mxc_timer_init	2012-05-16 12:46:09 +02:00
iomux-v1.c	ARM: mxc: iomux-v1: Fix build warning	2011-07-07 09:07:33 +02:00
iomux-v3.c	MXC IOMUX-V3 replace struct pad_desc with bitmapped cookie (step 2)	2010-12-15 12:42:49 +01:00
iram_alloc.c	ARM: imx: Add iram allocator functions	2010-10-19 18:44:57 +02:00
irq-common.c	ARM i.MX avic: convert to use generic irq chip	2011-09-23 08:32:14 +02:00
irq-common.h	ARM i.MX avic: convert to use generic irq chip	2011-09-23 08:32:14 +02:00
Kconfig	ASoC: imx: move audmux driver into sound/soc/imx	2012-03-06 00:03:00 +00:00
Makefile	ASoC: imx: move audmux driver into sound/soc/imx	2012-03-06 00:03:00 +00:00
pwm.c	ARM: mxc: pwm: add clk_prepare/clk_unprepare	2012-02-01 14:27:59 +01:00
ssi-fiq-ksym.c	ASoC: Add a new imx-ssi sound driver	2010-01-17 11:09:46 +00:00
ssi-fiq.S	ARM: mxc: Correct data alignment in headsmp.S for CONFIG_THUMB2_KERNEL	2011-04-12 09:48:10 +02:00
system.c	Disintegrate and delete asm/system.h	2012-03-28 15:58:21 -07:00
time.c	ARM i.MX: remove now unnecessary argument from mxc_timer_init	2012-05-16 12:46:09 +02:00
tzic.c	ARM: mx5: use generic irq chip pm interface for pm functions on	2011-12-25 12:02:28 +08:00
ulpi.c	usb: otg: ulpi: Start using struct usb_otg	2012-02-13 13:35:56 +02:00