0
0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-22 02:24:57 +08:00
linux/drivers/media/dvb/dvb-core
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
..
demux.h
dmxdev.c headers: remove sched.h from poll.h 2009-10-04 15:05:10 -07:00
dmxdev.h V4L/DVB (12275): Add two new ioctls: DMX_ADD_PID and DMX_REMOVE_PID 2009-09-12 12:17:43 -03:00
dvb_ca_en50221.c V4L/DVB (10391): dvb: constify VFTs 2009-03-30 12:42:34 -03:00
dvb_ca_en50221.h V4L/DVB (9054): implement proper locking in the dvb ca en50221 driver 2009-01-29 08:35:37 -02:00
dvb_demux.c V4L/DVB (13271): TS speed check. Logging transport stream speed in Kbits per second 2009-12-05 18:41:11 -02:00
dvb_demux.h V4L/DVB (13271): TS speed check. Logging transport stream speed in Kbits per second 2009-12-05 18:41:11 -02:00
dvb_filter.c
dvb_filter.h
dvb_frontend.c V4L/DVB (13157): dvb_frontend: represent all DVBS2API commands via macro 2009-12-05 18:40:37 -02:00
dvb_frontend.h tree-wide: fix assorted typos all over the place 2009-12-04 15:39:55 +01:00
dvb_math.c
dvb_math.h
dvb_net.c tree-wide: fix a very frequent spelling mistake 2009-11-09 09:40:54 +01:00
dvb_net.h
dvb_ringbuffer.c
dvb_ringbuffer.h
dvbdev.c Driver-Core: extend devnode callbacks to provide permissions 2009-09-19 12:50:38 -07:00
dvbdev.h V4L/DVB (13103): create a standard method for dvb adapter drivers to override frontend ioctls 2009-12-05 18:40:21 -02:00
Makefile