1
0
Fork 0
alistair23-linux/Documentation/trace
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
..
postprocess mm: vmscan: tracepoint: account for scanned pages similarly for both ftrace and vmstat 2010-12-22 19:43:33 -08:00
events-kmem.txt mm tracing: cleanup Documentation/trace/events-kmem.txt 2009-12-22 14:17:55 -08:00
events-power.txt tools, perf: Documentation for the power events API 2011-01-05 21:25:29 +01:00
events.txt Documentation/trace/events.txt: Remove obsolete sched_signal_send. 2011-01-08 00:04:32 +01:00
ftrace-design.txt tracing/documentation: Document dynamic ftracer internals 2010-07-21 11:00:25 -04:00
ftrace.txt tracing: Add documentation for trace commands mod, traceon/traceoff 2010-04-27 16:51:49 -04:00
function-graph-fold.vim tracing: Add vim script to enable folding for function_graph traces 2009-08-26 00:32:04 -04:00
kprobetrace.txt tracing/kprobes: Support "string" type 2010-07-05 15:54:45 -03:00
mmiotrace.txt Documentation: Update mmiotrace.txt 2009-12-20 06:18:23 +01:00
ring-buffer-design.txt Documentation: update ring-buffer-design.txt 2010-01-11 09:34:07 -08:00
tracepoint-analysis.txt Documentation: Update tracepoint-analysis.txt 2009-12-20 06:18:25 +01:00
tracepoints.txt tracing: consolidate documents 2009-04-09 07:28:10 +02:00