Merge branch 'v4l_for_linus' into patchwork
authorMauro Carvalho Chehab <mchehab@redhat.com>
Tue, 25 Jun 2013 10:24:22 +0000 (07:24 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Tue, 25 Jun 2013 10:25:09 +0000 (07:25 -0300)
commit188af63c0af2d7ef395bc94e3efa173f34dae03d
treec2648c26ac37b836140ad499e0f5c0eec5586f5f
parent05959be7b646e8755a9339ad13e3b87849249f90
parentbb69ee27b96110c509d5b92c9ee541d81a821706
Merge branch 'v4l_for_linus' into patchwork

* v4l_for_linus:
  [media] Fix build when drivers are builtin and frontend modules
  [media] s5p makefiles: don't override other selections on obj-[ym]
  [media] exynos4-is: Fix FIMC-IS clocks initialization
  [media] rtl28xxu: fix buffer overflow when probing Rafael Micro r820t tuner

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/media/platform/exynos4-is/fimc-is.c
drivers/media/platform/exynos4-is/fimc-is.h
drivers/media/usb/dvb-usb-v2/rtl28xxu.c