linux/drivers/media/video/cx25840
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
..
cx25840-audio.c [media] Add support for AUX_PLL on cx2583x chips 2010-10-21 09:41:45 -02:00
cx25840-core.c [media] cx25840: Prevent device probe failure due to volume control ERANGE error 2011-01-03 09:08:16 -02:00
cx25840-core.h V4L/DVB: cx25840: convert to the new control framework 2010-08-08 23:43:05 -03:00
cx25840-firmware.c V4L/DVB (13088): cx25840: Convert chip/core family checks to static inline functions 2009-12-05 18:40:17 -02:00
cx25840-ir.c Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2011-01-13 10:05:56 -08:00
cx25840-vbi.c V4L/DVB: cx25840: support new vbi ops to set/get VBI format 2010-05-19 12:58:47 -03:00
Kconfig V4L/DVB (9507): v4l: remove EXPERIMENTAL from several drivers 2008-12-29 17:53:26 -02:00
Makefile V4L/DVB: cx25840: Add support for CX2388[57] A/V core integrated IR controllers 2010-08-08 23:42:55 -03:00