linux_dsm_epyc7002/drivers/media/video/omap
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
..
Kconfig V4L/DVB: OMAP_VOUT: fix: Replaced dma-sg with dma-contig 2010-07-08 16:49:37 -03:00
Makefile V4L/DVB: OMAP_VOUT: fix: Module params were not working through bootargs 2010-07-08 16:49:48 -03:00
omap_vout.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
omap_voutdef.h V4L/DVB: V4L2: Add support for OMAP2/3 V4L2 display driver on top of DSS2 2010-05-19 12:58:10 -03:00
omap_voutlib.c V4L/DVB: V4L2: Add support for OMAP2/3 V4L2 display driver on top of DSS2 2010-05-19 12:58:10 -03:00
omap_voutlib.h V4L/DVB: V4L2: Add support for OMAP2/3 V4L2 display driver on top of DSS2 2010-05-19 12:58:10 -03:00