git.stricted.de - GitHub/exynos8895/android_kernel_samsung

projects / GitHub / exynos8895 / android_kernel_samsung_universal8895.git / commit

author	Ingo Molnar <mingo@elte.hu>
	Wed, 1 Apr 2009 19:54:19 +0000 (21:54 +0200)
committer	Ingo Molnar <mingo@elte.hu>
	Wed, 1 Apr 2009 22:49:02 +0000 (00:49 +0200)
commit	8302294f43250dc337108c51882a6007f2b1e2e0
tree	85acd4440799c46a372df9cad170fa0c21e59096	tree \| snapshot (tar.gz zip)
parent	4fe70410d9a219dabb47328effccae7e7f2a6e26	commit \| diff
parent	2e572895bf3203e881356a4039ab0fa428ed2639	commit \| diff

Merge branch 'tracing/core-v2' into tracing-for-linus

Conflicts:
include/linux/slub_def.h
lib/Kconfig.debug
mm/slob.c
mm/slub.c

33 files changed:

Documentation/kernel-parameters.txt	diff1 \|	diff2 \|	blob \| history
Documentation/sysrq.txt	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	diff1 \|	diff2 \|	blob \| history
arch/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/ia64/kernel/Makefile	diff1 \|	diff2 \|	blob \| history
arch/x86/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/cacheflush.h	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/Makefile	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/kprobes.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/process.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/ptrace.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kvm/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/char/sysrq.c	diff1 \|	diff2 \|	blob \| history
fs/partitions/check.c	diff1 \|	diff2 \|	blob \| history
include/asm-generic/vmlinux.lds.h	diff1 \|	diff2 \|	blob \| history
include/linux/interrupt.h	diff1 \|	diff2 \|	blob \| history
include/linux/kernel.h	diff1 \|	diff2 \|	blob \| history
include/linux/sched.h	diff1 \|	diff2 \|	blob \| history
include/linux/slub_def.h	diff1 \|	diff2 \|	blob \| history
include/linux/string.h	diff1 \|	diff2 \|	blob \| history
init/Kconfig	diff1 \|	diff2 \|	blob \| history
init/main.c	diff1 \|	diff2 \|	blob \| history
kernel/irq/handle.c	diff1 \|	diff2 \|	blob \| history
kernel/lockdep.c	diff1 \|	diff2 \|	blob \| history
kernel/module.c	diff1 \|	diff2 \|	blob \| history
kernel/relay.c	diff1 \|	diff2 \|	blob \| history
kernel/sched.c	diff1 \|	diff2 \|	blob \| history
kernel/sched_clock.c	diff1 \|	diff2 \|	blob \| history
kernel/workqueue.c	diff1 \|	diff2 \|	blob \| history
lib/Kconfig	diff1 \|	diff2 \|	blob \| history
mm/slob.c	diff1 \|	diff2 \|	blob \| history
mm/slub.c	diff1 \|	diff2 \|	blob \| history

RSS Atom

Documentation/kernel-parameters.txt	diff1 \|	diff2 \|	blob \| history
Documentation/sysrq.txt	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	diff1 \|	diff2 \|	blob \| history
arch/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/ia64/kernel/Makefile	diff1 \|	diff2 \|	blob \| history
arch/x86/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/cacheflush.h	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/Makefile	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/kprobes.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/process.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/ptrace.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kvm/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/char/sysrq.c	diff1 \|	diff2 \|	blob \| history
fs/partitions/check.c	diff1 \|	diff2 \|	blob \| history
include/asm-generic/vmlinux.lds.h	diff1 \|	diff2 \|	blob \| history
include/linux/interrupt.h	diff1 \|	diff2 \|	blob \| history
include/linux/kernel.h	diff1 \|	diff2 \|	blob \| history
include/linux/sched.h	diff1 \|	diff2 \|	blob \| history
include/linux/slub_def.h	diff1 \|	diff2 \|	blob \| history
include/linux/string.h	diff1 \|	diff2 \|	blob \| history
init/Kconfig	diff1 \|	diff2 \|	blob \| history
init/main.c	diff1 \|	diff2 \|	blob \| history
kernel/irq/handle.c	diff1 \|	diff2 \|	blob \| history
kernel/lockdep.c	diff1 \|	diff2 \|	blob \| history
kernel/module.c	diff1 \|	diff2 \|	blob \| history
kernel/relay.c	diff1 \|	diff2 \|	blob \| history
kernel/sched.c	diff1 \|	diff2 \|	blob \| history
kernel/sched_clock.c	diff1 \|	diff2 \|	blob \| history
kernel/workqueue.c	diff1 \|	diff2 \|	blob \| history
lib/Kconfig	diff1 \|	diff2 \|	blob \| history
mm/slob.c	diff1 \|	diff2 \|	blob \| history
mm/slub.c	diff1 \|	diff2 \|	blob \| history