linux/drivers/media/video/davinci
Linus Torvalds 008d23e485 Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (43 commits)
  Documentation/trace/events.txt: Remove obsolete sched_signal_send.
  writeback: fix global_dirty_limits comment runtime -> real-time
  ppc: fix comment typo singal -> signal
  drivers: fix comment typo diable -> disable.
  m68k: fix comment typo diable -> disable.
  wireless: comment typo fix diable -> disable.
  media: comment typo fix diable -> disable.
  remove doc for obsolete dynamic-printk kernel-parameter
  remove extraneous 'is' from Documentation/iostats.txt
  Fix spelling milisec -> ms in snd_ps3 module parameter description
  Fix spelling mistakes in comments
  Revert conflicting V4L changes
  i7core_edac: fix typos in comments
  mm/rmap.c: fix comment
  sound, ca0106: Fix assignment to 'channel'.
  hrtimer: fix a typo in comment
  init/Kconfig: fix typo
  anon_inodes: fix wrong function name in comment
  fix comment typos concerning "consistent"
  poll: fix a typo in comment
  ...

Fix up trivial conflicts in:
 - drivers/net/wireless/iwlwifi/iwl-core.c (moved to iwl-legacy.c)
 - fs/ext4/ext4.h

Also fix missed 'diabled' typo in drivers/net/bnx2x/bnx2x.h while at it.
2011-01-13 10:05:56 -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_regs.h V4L/DVB (12250): v4l: dm355 ccdc module for vpfe capture driver 2009-09-19 00:18:15 -03:00
dm355_ccdc.c V4L/DVB: vpfe-capture - converting dm355 ccdc driver to a platform driver 2010-02-26 15:10:45 -03:00
dm644x_ccdc_regs.h V4L/DVB: V4L: dm644x_ccdc: Add Suspend/Resume Support 2010-05-18 00:52:45 -03:00
dm644x_ccdc.c V4L/DVB: V4L: dm644x_ccdc: Add Suspend/Resume Support 2010-05-18 00:52:45 -03:00
isif_regs.h V4L/DVB: Fix bad whitespacing 2010-05-18 00:47:01 -03:00
isif.c V4L/DVB: V4L - vpfe capture - source for ISIF driver on DM365 2010-02-26 15:11:06 -03:00
Kconfig V4L/DVB: vpfe_capture: Create separate Kconfig file for davinci devices 2010-08-02 15:30:36 -03:00
Makefile V4L/DVB: V4L - vpfe capture - build environment for isif driver 2010-02-26 15:11:06 -03:00
vpfe_capture.c [media] drivers/media/video: Remove unnecessary semicolons 2010-12-29 08:16:56 -02:00
vpif_capture.c [media] v4l: Remove module_name argument to the v4l2_i2c_new_subdev* functions 2010-11-22 11:56:26 -02:00
vpif_capture.h V4L/DVB (12906c): V4L : vpif capture driver for DM6467 2009-09-19 00:19:39 -03:00
vpif_display.c [media] v4l: Remove module_name argument to the v4l2_i2c_new_subdev* functions 2010-11-22 11:56:26 -02:00
vpif_display.h
vpif.c V4L/DVB (13607): vpif: move vpif_remove to .devexit 2009-12-16 00:18:37 -02:00
vpif.h tree-wide: fix comment/printk typos 2010-11-01 15:38:34 -04:00
vpss.c tree-wide: fix comment/printk typos 2010-11-01 15:38:34 -04:00