OpenCloudOS-Kernel/drivers/media/dvb
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
..
b2c2 V4L/DVB (12294): b2c2: Use dvb-pll for Cablestar2 2009-09-12 12:17:52 -03:00
bt8xx V4L/DVB (13523): dvb-bt8xx: fix compile warning 2009-12-05 18:42:15 -02:00
dm1105 V4L/DVB (13537): ir: Prepare the code for dynamic keycode table allocation 2009-12-05 18:42:21 -02:00
dvb-core 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
dvb-usb 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
firewire V4L/DVB (13410): firedtv: remove an unnecessary function argument 2009-12-05 18:41:44 -02:00
frontends 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
pluto2 V4L/DVB (12483): Use DIV_ROUND_CLOSEST 2009-09-12 12:19:08 -03:00
pt1 V4L/DVB (13522): valj5jf8007s/t: fix compile warnings 2009-12-05 18:42:15 -02:00
siano V4L/DVB (13416): smssdio: initialize return value 2009-12-05 18:41:46 -02:00
ttpci 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
ttusb-budget V4L/DVB (10149): ttusb-budget: make it depend on PCI 2009-01-02 17:12:21 -02:00
ttusb-dec V4L/DVB (13414): ttusb-dec: do not overwrite the first part of phys string 2009-12-05 18:41:45 -02:00
Kconfig V4L/DVB (12999): Add a driver for Earthsoft PT1 2009-09-19 00:51:41 -03:00
Makefile V4L/DVB (12999): Add a driver for Earthsoft PT1 2009-09-19 00:51:41 -03:00