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
..
amiga
apollo
atari	m68k: atari - Rename "mfp" to "st_mfp"	2009-02-22 09:23:02 -08:00
bvme6000
configs
fpsp040
hp300
ifpsp060
include/asm	Merge branch 'tracing-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2009-04-05 11:04:19 -07:00
kernel	Merge git://git.kernel.org/pub/scm/linux/kernel/git/kyle/rtc-parisc	2009-04-03 09:51:35 -07:00
lib
mac	m68k: mac - Add SWIM floppy support	2009-03-26 21:15:27 +01:00
math-emu
mm
mvme16x
mvme147
q40
sun3
sun3x
tools/amiga
install.sh	m68k: Add install target	2009-03-26 21:15:26 +01:00
Kconfig
Kconfig.debug
Makefile	m68k: Add install target	2009-03-26 21:15:26 +01:00