linux/drivers/media/video/davinci
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
..
ccdc_hw_device.h V4L/DVB (12249): v4l: ccdc hw device header file for vpfe capture 2009-09-19 00:18:13 -03:00
dm355_ccdc.c V4L/DVB (13288): adding __init/__exit macros to various drivers 2009-12-05 18:41:12 -02:00
dm355_ccdc_regs.h V4L/DVB (12250): v4l: dm355 ccdc module for vpfe capture driver 2009-09-19 00:18:15 -03:00
dm644x_ccdc.c V4L/DVB (13288): adding __init/__exit macros to various drivers 2009-12-05 18:41:12 -02:00
dm644x_ccdc_regs.h V4L/DVB (12251): v4l: dm644x ccdc module for vpfe capture driver 2009-09-19 00:18:16 -03:00
Makefile V4L/DVB (12906b): V4L : vpif capture - Kconfig and Makefile changes 2009-09-19 00:19:37 -03:00
vpfe_capture.c V4L/DVB (13469): Davinci VPFE Capture: Add support for Control ioctls 2009-12-05 18:42:03 -02:00
vpif.c V4L/DVB (12906d): V4L : vpif updates for DM6467 vpif capture driver 2009-09-19 00:19:40 -03:00
vpif.h V4L/DVB (12906d): V4L : vpif updates for DM6467 vpif capture driver 2009-09-19 00:19:40 -03:00
vpif_capture.c V4L/DVB (12906c): V4L : vpif capture driver for DM6467 2009-09-19 00:19:39 -03:00
vpif_capture.h V4L/DVB (12906c): V4L : vpif capture driver for DM6467 2009-09-19 00:19:39 -03:00
vpif_display.c V4L/DVB (13371): davinci: remove stray duplicate config pointer 2009-11-26 19:38:04 -02:00
vpif_display.h
vpss.c tree-wide: fix assorted typos all over the place 2009-12-04 15:39:55 +01:00