leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity
eac8ea536a
linux/drivers/media/video/cx23885
History
Linus Torvalds 3e74683137 Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (345 commits)
  V4L/DVB (13542): ir-keytable: Allow dynamic table change
  V4L/DVB (13541): atbm8830: replace 64-bit division and floating point usage
  V4L/DVB (13540): ir-common: Cleanup get key evdev code
  V4L/DVB (13539): ir-common: add __func__ for debug messages
  V4L/DVB (13538): ir-common: Use a dynamic keycode table
  V4L/DVB (13537): ir: Prepare the code for dynamic keycode table allocation
  V4L/DVB (13536): em28xx: Use the full RC5 code on HVR-950 Remote Controller
  V4L/DVB (13535): ir-common: Add a hauppauge new table with the complete RC5 code
  V4L/DVB (13534): ir-common: Remove some unused fields/structs
  V4L/DVB (13533): ir: use dynamic tables, instead of static ones
  V4L/DVB (13532): ir-common: Add infrastructure to use a dynamic keycode table
  V4L/DVB (13531): ir-common: rename the debug routine to allow exporting it
  V4L/DVB (13458): go7007: subdev conversion
  V4L/DVB (13457): s2250: subdev conversion
  V4L/DVB (13456): s2250: Change module structure
  V4L/DVB (13528): em28xx: add support for em2800 VC211A card
  em28xx: don't reduce scale to half size for em2800
  em28xx: don't load audio modules when AC97 is mis-detected
  em28xx: em2800 chips support max width of 640
  V4L/DVB (13523): dvb-bt8xx: fix compile warning
  ...

Fix up trivial conflicts due to spelling fixes from the trivial tree in
	Documentation/video4linux/gspca.txt
	drivers/media/video/cx18/cx18-mailbox.h
2009-12-09 19:50:49 -08:00
..
cimax2.c V4L/DVB (12956): Fix gpio mutex in NetUP Dual DVB-S2 CI card. 2009-09-19 00:15:48 -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 V4L/DVB (13085): cx23885: Fix support for v4l2-dbg access to CX2388[578] and CX23417 regs 2009-12-05 18:40:16 -02:00
cx23885-cards.c V4L/DVB (13493): TeVii S470 and TBS 6920 fixes 2009-12-05 18:42:08 -02:00
cx23885-core.c V4L/DVB (13493): TeVii S470 and TBS 6920 fixes 2009-12-05 18:42:08 -02:00
cx23885-dvb.c Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 2009-12-09 19:50:49 -08: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 V4L/DVB (12343): Stop defining I2C adapter IDs nobody uses 2009-09-12 12:18:13 -03:00
cx23885-input.c V4L/DVB (13537): ir: Prepare the code for dynamic keycode table allocation 2009-12-05 18:42:21 -02:00
cx23885-input.h V4L/DVB (13100): cx23885: Add IR input keypress handling and enable for the HVR-1850 2009-12-05 18:40:21 -02:00
cx23885-ioctl.c V4L/DVB (13086): cx23885: Add skeleton v4l2_subdev for the CX23888 integrated IR controller 2009-12-05 18:40:16 -02:00
cx23885-ioctl.h V4L/DVB (13085): cx23885: Fix support for v4l2-dbg access to CX2388[578] and CX23417 regs 2009-12-05 18:40:16 -02:00
cx23885-ir.c V4L/DVB (13100): cx23885: Add IR input keypress handling and enable for the HVR-1850 2009-12-05 18:40:21 -02:00
cx23885-ir.h V4L/DVB (13098): cx23885: Add integrated IR subdevice interrupt and notification handling 2009-12-05 18:40:20 -02:00
cx23885-reg.h V4L/DVB (13098): cx23885: Add integrated IR subdevice interrupt and notification handling 2009-12-05 18:40:20 -02:00
cx23885-vbi.c V4L/DVB (8906): v4l-dvb: fix assorted sparse warnings 2008-10-12 09:36:58 -02:00
cx23885-video.c V4L/DVB (13211): cx23885: card Mygica X8506 analog TV support 2009-12-05 18:40:54 -02:00
cx23885.h V4L/DVB (13493): TeVii S470 and TBS 6920 fixes 2009-12-05 18:42:08 -02:00
cx23888-ir.c V4L/DVB (13253): cx23885: CodingStyle fix 2009-12-05 18:41:08 -02:00
cx23888-ir.h V4L/DVB (13086): cx23885: Add skeleton v4l2_subdev for the CX23888 integrated IR controller 2009-12-05 18:40:16 -02:00
Kconfig V4L/DVB (13493): TeVii S470 and TBS 6920 fixes 2009-12-05 18:42:08 -02:00
Makefile V4L/DVB (13493): TeVii S470 and TBS 6920 fixes 2009-12-05 18:42:08 -02: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