kernel-fxtec-pro1x/drivers/media/video/cx18
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
..
cx18-alsa-main.c
cx18-alsa-mixer.c
cx18-alsa-mixer.h
cx18-alsa-pcm.c
cx18-alsa-pcm.h
cx18-alsa.h
cx18-audio.c
cx18-audio.h
cx18-av-audio.c [media] cx18: Use the control framework 2011-03-21 20:31:49 -03:00
cx18-av-core.c [media] cx18: Use the control framework 2011-03-21 20:31:49 -03:00
cx18-av-core.h Fix common misspellings 2011-03-31 11:26:23 -03:00
cx18-av-firmware.c
cx18-av-vbi.c
cx18-cards.c [media] cx18: Add support for Hauppauge HVR-1600 models with s5h1411 2011-03-02 13:45:56 -03:00
cx18-cards.h
cx18-controls.c [media] cx18: Use the control framework 2011-03-21 20:31:49 -03:00
cx18-controls.h [media] cx18: Use the control framework 2011-03-21 20:31:49 -03:00
cx18-driver.c [media] cx18: fix kernel oops when setting MPEG control before capturing 2011-03-21 20:32:19 -03:00
cx18-driver.h [media] cx18: use core priority handling 2011-03-22 16:38:04 -03:00
cx18-dvb.c [media] cx18: Add support for Hauppauge HVR-1600 models with s5h1411 2011-03-02 13:45:56 -03:00
cx18-dvb.h
cx18-fileops.c [media] cx18: use core priority handling 2011-03-22 16:38:04 -03:00
cx18-fileops.h
cx18-firmware.c
cx18-firmware.h
cx18-gpio.c
cx18-gpio.h
cx18-i2c.c [media] remove the old RC_MAP_HAUPPAUGE_NEW RC map 2011-03-22 19:24:16 -03:00
cx18-i2c.h
cx18-io.c
cx18-io.h
cx18-ioctl.c Fix common misspellings 2011-03-31 11:26:23 -03:00
cx18-ioctl.h
cx18-irq.c
cx18-irq.h
cx18-mailbox.c [media] cx18: Use the control framework 2011-03-21 20:31:49 -03:00
cx18-mailbox.h [media] cx18: Use the control framework 2011-03-21 20:31:49 -03:00
cx18-queue.c
cx18-queue.h
cx18-scb.c
cx18-scb.h
cx18-streams.c [media] cx18: Fix list BUG for IDX stream, triggerable in cx18_probe() error clean up, 2011-04-13 09:41:02 -03:00
cx18-streams.h [media] v4l/cx18: update workqueue usage 2011-01-19 11:45:46 -02:00
cx18-vbi.c Fix common misspellings 2011-03-31 11:26:23 -03:00
cx18-vbi.h
cx18-version.h
cx18-video.c
cx18-video.h
cx23418.h [media] drivers:media:cx23418.h remove one to many l's in the word 2011-03-21 20:32:41 -03:00
Kconfig
Makefile