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
..
configs	sgi-gru: remove SGI_GRU as a valid config option for ia64 configs with SGI_UV	2009-04-02 19:05:07 -07:00
dig
hp	proc tty: switch ia64 simserial to ->proc_fops	2009-04-01 08:59:10 -07:00
ia32	generic compat_sys_ustat	2009-03-27 14:43:57 -04:00
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 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
kvm	Pull pvops into release branch	2009-03-31 14:25:08 -07:00
lib
mm	[IA64] BUG to BUG_ON changes	2009-04-01 09:50:48 -07:00
oprofile
pci
scripts
sn	[IA64] BUG to BUG_ON changes	2009-04-01 09:50:48 -07:00
uv
xen	ia64: remove some warnings.	2009-03-27 11:11:04 -07:00
install.sh
Kconfig
Kconfig.debug
Makefile
module.lds