aha/Documentation/vm
Linus Torvalds 714f83d5d9 Merge branch 'tracing-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'tracing-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (413 commits)
  tracing, net: fix net tree and tracing tree merge interaction
  tracing, powerpc: fix powerpc tree and tracing tree interaction
  ring-buffer: do not remove reader page from list on ring buffer free
  function-graph: allow unregistering twice
  trace: make argument 'mem' of trace_seq_putmem() const
  tracing: add missing 'extern' keywords to trace_output.h
  tracing: provide trace_seq_reserve()
  blktrace: print out BLK_TN_MESSAGE properly
  blktrace: extract duplidate code
  blktrace: fix memory leak when freeing struct blk_io_trace
  blktrace: fix blk_probes_ref chaos
  blktrace: make classic output more classic
  blktrace: fix off-by-one bug
  blktrace: fix the original blktrace
  blktrace: fix a race when creating blk_tree_root in debugfs
  blktrace: fix timestamp in binary output
  tracing, Text Edit Lock: cleanup
  tracing: filter fix for TRACE_EVENT_FORMAT events
  ftrace: Using FTRACE_WARN_ON() to check "freed record" in ftrace_release()
  x86: kretprobe-booster interrupt emulation code fix
  ...

Fix up trivial conflicts in
 arch/parisc/include/asm/ftrace.h
 include/linux/memory.h
 kernel/extable.c
 kernel/module.c
2009-04-05 11:04:19 -07:00
..
.gitignore .gitignore updates 2008-10-30 11:38:45 -07:00
00-INDEX doc: move vm/00-INDEX to Documentation/vm 2007-10-17 08:43:05 -07:00
balance Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
hugetlbpage.txt Documentation cleanup: trivial misspelling, punctuation, and grammar corrections. 2008-07-26 12:00:06 -07:00
kmemtrace.txt kmemtrace: remove config option for enabling tracing at boot 2008-12-29 15:34:17 +02:00
locking [PATCH] swap: swap_lock replace list+device 2005-09-05 00:05:42 -07:00
Makefile docsrc: build Documentation/ sources 2008-08-12 16:07:30 -07:00
numa Documentation: remove duplicated words 2006-10-03 22:57:56 +02:00
numa_memory_policy.txt trivial: fix where cgroup documentation is not correctly referred to 2009-03-30 15:22:02 +02:00
overcommit-accounting Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
page_migration trivial: fix where cgroup documentation is not correctly referred to 2009-03-30 15:22:02 +02:00
pagemap.txt pagemap: add documentation for pagemap 2008-06-06 11:29:14 -07:00
slabinfo.c Christoph has moved 2008-07-04 10:40:04 -07:00
slub.txt Christoph has moved 2008-07-04 10:40:04 -07:00
unevictable-lru.txt mm: remove try_to_munlock from vmscan 2009-01-06 15:59:03 -08:00