OpenCloudOS-Kernel/drivers/media/common
Linus Torvalds 7fcaa9aaea Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6
* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (42 commits)
  [media] media: vb2: correct queue initialization order
  [media] media: vb2: fix incorrect v4l2_buffer->flags handling
  [media] s5p-fimc: Add support for the buffer timestamps and sequence
  [media] s5p-fimc: Fix bytesperline and plane payload setup
  [media] s5p-fimc: Do not allow changing format after REQBUFS
  [media] s5p-fimc: Fix FIMC3 pixel limits on Exynos4
  [media] tda18271: update tda18271c2_rf_cal as per NXP's rev.04 datasheet
  [media] tda18271: update tda18271_rf_band as per NXP's rev.04 datasheet
  [media] tda18271: fix bad calculation of main post divider byte
  [media] tda18271: prog_cal and prog_tab variables should be s32, not u8
  [media] tda18271: fix calculation bug in tda18271_rf_tracking_filters_init
  [media] omap3isp: queue: Don't corrupt buf->npages when get_user_pages() fails
  [media] v4l: Don't register media entities for subdev device nodes
  [media] omap3isp: Don't increment node entity use count when poweron fails
  [media] omap3isp: lane shifter support
  [media] omap3isp: ccdc: support Y10/12, 8-bit bayer fmts
  [media] media: add missing 8-bit bayer formats and Y12
  [media] v4l: add V4L2_PIX_FMT_Y12 format
  cx23885: Fix stv0367 Kconfig dependency
  [media] omap3isp: Use isp xclk defines
  ...

Fix up trivial conflict (spelink errurs) in drivers/media/video/omap3isp/isp.c
2011-04-27 15:17:52 -07:00
..
tuners Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 2011-04-27 15:17:52 -07:00
Kconfig V4L/DVB (7133): Fix Kconfig dependencies 2008-02-18 11:14:53 -03:00
Makefile V4L/DVB (13612): IR: Move common IR code to drivers/media/IR 2009-12-16 00:18:42 -02:00
saa7146_core.c [media] saa7146: Convert from .ioctl to .unlocked_ioctl 2011-01-19 11:28:10 -02:00
saa7146_fops.c [media] saa7146: Convert from .ioctl to .unlocked_ioctl 2011-01-19 11:28:10 -02:00
saa7146_hlp.c [media] Don't export format_by_forcc on two different drivers 2010-12-02 01:59:10 -02:00
saa7146_i2c.c Fix common misspellings 2011-03-31 11:26:23 -03:00
saa7146_vbi.c [media] saa7146: Convert from .ioctl to .unlocked_ioctl 2011-01-19 11:28:10 -02:00
saa7146_video.c [media] saa7146: Convert from .ioctl to .unlocked_ioctl 2011-01-19 11:28:10 -02:00