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
..
drivers	Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/linux-hdreg-h-cleanup	16 years ago
include	Merge branch 'tracing/core-v2' into tracing-for-linus	16 years ago
kernel	Simplify copy_thread()	16 years ago
os-Linux	uml: improve error messages	16 years ago
scripts	…
sys-i386	uml: fix link error from prefixing of i386 syscalls with ptregs_	16 years ago
sys-ia64	uml: remove useless comments	16 years ago
sys-ppc	uml: remove useless comments	16 years ago
sys-x86_64	uml: remove useless comments	16 years ago
Kconfig.char	sound: make OSS sound core optional	17 years ago
Kconfig.common	x86, um: get rid of arch/um/Kconfig.arch	17 years ago
Kconfig.debug	…
Kconfig.net	…
Kconfig.rest	x86, um: get rid of arch/um/Kconfig.arch	17 years ago
Kconfig.um	x86, um: get rid of arch/um/Kconfig.arch	17 years ago
Kconfig.x86	x86, um: get rid of arch/um/Kconfig.arch	17 years ago
Makefile	get rid of the last symlink in uml build	16 years ago
Makefile-i386	[UML] fix gcc ICEs and unresolved externs	17 years ago
Makefile-ia64	…
Makefile-os-Linux	x86, um: get rid of arch/um/os symlink	17 years ago
Makefile-ppc	…
Makefile-skas	…
Makefile-x86_64	[UML] fix gcc ICEs and unresolved externs	17 years ago
defconfig	…