Linus Torvalds 92b29b86fe Merge branch 'tracing-v28-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip ... * 'tracing-v28-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (131 commits) tracing/fastboot: improve help text tracing/stacktrace: improve help text tracing/fastboot: fix initcalls disposition in bootgraph.pl tracing/fastboot: fix bootgraph.pl initcall name regexp tracing/fastboot: fix issues and improve output of bootgraph.pl tracepoints: synchronize unregister static inline tracepoints: tracepoint_synchronize_unregister() ftrace: make ftrace_test_p6nop disassembler-friendly markers: fix synchronize marker unregister static inline tracing/fastboot: add better resolution to initcall debug/tracing trace: add build-time check to avoid overrunning hex buffer ftrace: fix hex output mode of ftrace tracing/fastboot: fix initcalls disposition in bootgraph.pl tracing/fastboot: fix printk format typo in boot tracer ftrace: return an error when setting a nonexistent tracer ftrace: make some tracers reentrant ring-buffer: make reentrant ring-buffer: move page indexes into page headers tracing/fastboot: only trace non-module initcalls ftrace: move pc counter in irqtrace ... Manually fix conflicts: - init/main.c: initcall tracing - kernel/module.c: verbose level vs tracepoints - scripts/bootgraph.pl: fallout from cherry-picking commits.		2008-10-20 13:35:07 -07:00
..
boot	Merge commit 'origin'	2008-10-15 11:31:54 +11:00
configs	powerpc: disable CHRP and PMAC support in various defconfigs	2008-10-13 11:09:59 -05:00
include/asm	Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2008-10-20 13:21:24 -07:00
kernel	kdump: make elfcorehdr_addr independent of CONFIG_PROC_VMCORE	2008-10-20 08:52:39 -07:00
kvm	KVM: switch to get_user_pages_fast	2008-10-15 14:25:06 +02:00
lib	powerpc: Fix DMA offset for non-coherent DMA	2008-10-14 10:35:26 +11:00
math-emu	powerpc/math-emu: Use kernel generic math-emu code	2008-10-01 08:40:07 -05:00
mm	mm: cleanup to make remove_memory() arch-neutral	2008-10-20 08:50:25 -07:00
oprofile	powerpc/cell/oprofile: Fix test on overlay_tbl_offset in vma_map	2008-10-10 15:55:18 +11:00
platforms	Merge branch 'tracing-v28-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2008-10-20 13:35:07 -07:00
sysdev	Merge branch 'core-v28-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2008-10-16 15:17:40 -07:00
xmon	Merge branch 'linux-2.6'	2008-06-30 10:16:50 +10:00
Kconfig	container freezer: implement freezer cgroup subsystem	2008-10-20 08:52:34 -07:00
Kconfig.debug	powerpc: Split-out common MSI bitmap logic into msi_bitmap.c	2008-08-20 16:34:57 +10:00
Makefile	powerpc: Enforce a non-spe kernel build even on broken compilers	2008-09-15 11:08:41 -07:00