path: root/Makefile
diff options
authorLinus Torvalds <torvalds@linux-foundation.org>2013-03-31 11:40:33 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2013-03-31 11:40:33 -0700
commita7b436d356d0bdc6156e286f9c251beed1961d2d (patch)
tree2d937c56eb4f11e2e460346eb45a4f6f751af8e4 /Makefile
parentd299c29039aae518d0e70fc26fb158a80dfcd31a (diff)
parent35ccecef6ed48a5602755ddf580c45a026a1dc05 (diff)
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: "For a some fixes for Kernel 3.9: - subsystem build fix when VIDEO_DEV=y, VIDEO_V4L2=m and I2C=m - compilation fix for arm multiarch preventing IR_RX51 to be selected - regression fix at bttv crop logic - s5p-mfc/m5mols/exynos: a few fixes for cameras on exynos hardware" * 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: [media] [REGRESSION] bt8xx: Fix too large height in cropcap [media] fix compilation with both V4L2 and I2C as 'm' [media] m5mols: Fix bug in stream on handler [media] s5p-fimc: Do not attempt to disable not enabled media pipeline [media] s5p-mfc: Fix encoder control 15 issue [media] s5p-mfc: Fix frame skip bug [media] s5p-fimc: send valid m2m ctx to fimc_m2m_job_finish [media] exynos-gsc: send valid m2m ctx to gsc_m2m_job_finish [media] fimc-lite: Fix the variable type to avoid possible crash [media] fimc-lite: Initialize 'step' field in fimc_lite_ctrl structure [media] ir: IR_RX51 only works on OMAP2
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions