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
..
boot	kbuild: use KECHO convenience echo	2008-12-03 21:32:01 +01:00
configs	Blackfin arch: update default kernel configuration	2009-03-28 23:46:17 +08:00
include/asm	Merge branch 'tracing/core-v2' into tracing-for-linus	2009-04-02 00:49:02 +02:00
kernel	Simplify copy_thread()	2009-04-02 19:04:51 -07:00
lib	Blackfin arch: merge adeos blackfin part to arch/blackfin/	2009-01-07 23:14:39 +08:00
mach-bf518	Blackfin arch: add RSI's definitions to bf514 and bf516	2009-03-29 01:03:20 +08:00
mach-bf527	Blackfin arch: convert BF5{18,27,48}_FAMILY to CONFIG_BF{51,52,54}x	2009-03-28 20:32:57 +08:00
mach-bf533	Blackfin arch: SPI_MMC is now mainlined MMC_SPI	2009-03-06 00:27:57 +08:00
mach-bf537	Blackfin arch: add sport-spi related resource stuff to board file	2009-03-28 23:28:51 +08:00
mach-bf538	Blackfin arch: add stubs for anomalies 447 and 448	2009-03-06 00:20:49 +08:00
mach-bf548	Blackfin arch: convert BF5{18,27,48}_FAMILY to CONFIG_BF{51,52,54}x	2009-03-28 20:32:57 +08:00
mach-bf561	Blackfin arch: SPI_MMC is now mainlined MMC_SPI	2009-03-06 00:27:57 +08:00
mach-common	Blackfin arch: Blacklist Hibernate (PM_SUSPEND_MEM) on BF561 as well	2009-03-28 23:14:41 +08:00
mm	proc 2/2: remove struct proc_dir_entry::owner	2009-03-31 01:14:44 +04:00
oprofile	Blackfin arch: remove hardware PM code, oprofile not use it	2009-01-07 23:14:39 +08:00
Kconfig	trivial: fix typos/grammar errors in Kconfig texts	2009-03-30 15:22:01 +02:00
Kconfig.debug	Blackfin arch: use common KGDB_TESTS rather than our own KGDB_TESTCASE	2009-03-02 18:14:47 +08:00
Makefile	Blackfin arch: line up machine-/cpu- vars after BF54xM addition	2009-02-04 16:49:45 +08:00