You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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		16 years ago
..
buffer_sync.c	oprofile: Thou shalt not call __exit functions from __init functions	16 years ago
buffer_sync.h	cpumask: modifiy oprofile initialization	16 years ago
cpu_buffer.c	ring_buffer: remove unused flags parameter, fix	16 years ago
cpu_buffer.h	oprofile: fix uninitialized use of struct op_entry	16 years ago
event_buffer.c	oprofile: rename kernel-wide identifiers	16 years ago
event_buffer.h	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile	16 years ago
oprof.c	cpumask: modifiy oprofile initialization	16 years ago
oprof.h	oprofile: rename kernel-wide identifiers	16 years ago
oprofile_files.c	oprofile: rename kernel-wide identifiers	16 years ago
oprofile_stats.c	oprofile: fixing whitespaces in drivers/oprofile/*	16 years ago
oprofile_stats.h	oprofile: fixing whitespaces in drivers/oprofile/*	16 years ago
oprofilefs.c	zero i_uid/i_gid on inode allocation	16 years ago
timer_int.c	oprofile: fixing whitespaces in drivers/oprofile/*	16 years ago