Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-13 06:32:50 +00:00
Code Issues Packages Projects Releases Wiki Activity
409ab140e2
linux/drivers/media/video/cx23885
History
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
..
altera-ci.c [media] Fix CI code for NetUP Dual DVB-T/C CI RF card 2011-03-22 04:54:11 -03:00
altera-ci.h [media] altera-ci.h: add missing inline 2011-03-22 04:54:04 -03:00
cimax2.c Fix common misspellings 2011-03-31 11:26:23 -03:00
cimax2.h V4L/DVB (10798): Add CIMax(R) SP2 Common Interface code for NetUP Dual DVB-S2 CI card 2009-03-30 12:43:04 -03:00
cx23885-417.c [media] v4l: kill the BKL 2010-11-08 22:35:57 -02:00
cx23885-av.c V4L/DVB: cx23885: Move AV Core irq handling to a work handler 2010-08-08 23:42:56 -03:00
cx23885-av.h V4L/DVB: cx23885: Move AV Core irq handling to a work handler 2010-08-08 23:42:56 -03:00
cx23885-cards.c [media] cx23885: implement num_fds_portb, num_fds_portc parameters for cx23885_board structure 2011-03-21 20:32:18 -03:00
cx23885-core.c [media] cx23885: disable MSI for NetUP cards, otherwise CI is not working 2011-03-21 20:32:18 -03:00
cx23885-dvb.c [media] Force xc5000 firmware loading for NetUP Dual DVB-T/C CI RF card 2011-03-22 04:54:12 -03:00
cx23885-f300.c V4L/DVB (13493): TeVii S470 and TBS 6920 fixes 2009-12-05 18:42:08 -02:00
cx23885-f300.h V4L/DVB (13493): TeVii S470 and TBS 6920 fixes 2009-12-05 18:42:08 -02:00
cx23885-i2c.c [media] cx23885: Remove unused 'err:' labels to quiet compiler warning 2011-03-02 13:45:27 -03:00
cx23885-input.c [media] rc/keymaps: Rename Hauppauge table as rc-hauppauge 2011-03-22 19:24:14 -03:00
cx23885-input.h V4L/DVB: cx18, cx23885, v4l2 doc, MAINTAINERS: Update Andy Walls' email address 2010-06-01 01:24:29 -03:00
cx23885-ioctl.c V4L/DVB: cx18, cx23885, v4l2 doc, MAINTAINERS: Update Andy Walls' email address 2010-06-01 01:24:29 -03:00
cx23885-ioctl.h V4L/DVB: cx18, cx23885, v4l2 doc, MAINTAINERS: Update Andy Walls' email address 2010-06-01 01:24:29 -03:00
cx23885-ir.c V4L/DVB: cx23885: Move AV Core irq handling to a work handler 2010-08-08 23:42:56 -03:00
cx23885-ir.h V4L/DVB: cx18, cx23885, v4l2 doc, MAINTAINERS: Update Andy Walls' email address 2010-06-01 01:24:29 -03:00
cx23885-reg.h [media] cx23885: disable MSI for NetUP cards, otherwise CI is not working 2011-03-21 20:32:18 -03:00
cx23885-vbi.c V4L/DVB: cx23885: Protect PCI interrupt mask manipulations with a spinlock 2010-08-08 23:42:55 -03:00
cx23885-video.c [media] cx23885: implement tuner_bus parameter for cx23885_board structure 2011-03-21 20:32:18 -03:00
cx23885.h Fix common misspellings 2011-03-31 11:26:23 -03:00
cx23888-ir.c [media] rc: rename the remaining things to rc_core 2010-12-29 08:16:50 -02:00
cx23888-ir.h V4L/DVB: cx18, cx23885, v4l2 doc, MAINTAINERS: Update Andy Walls' email address 2010-06-01 01:24:29 -03:00
Kconfig cx23885: Fix stv0367 Kconfig dependency 2011-04-17 08:09:39 -03:00
Makefile [media] Altera FPGA based CI driver module 2011-03-21 20:32:16 -03:00
netup-eeprom.c V4L/DVB (12957): Fix MAC address reading from EEPROM in NetUP Dual DVB-S2 CI card. 2009-09-19 00:15:49 -03:00
netup-eeprom.h V4L/DVB (10797): Add EEPROM code for NetUP Dual DVB-S2 CI card. 2009-03-30 12:43:04 -03:00
netup-init.c V4L/DVB (10796): Add init code for NetUP Dual DVB-S2 CI card 2009-03-30 12:43:04 -03:00
netup-init.h V4L/DVB (10796): Add init code for NetUP Dual DVB-S2 CI card 2009-03-30 12:43:04 -03:00