git.stricted.de - GitHub/moto-9609/android_kernel_motorola

projects / GitHub / moto-9609 / android_kernel_motorola_exynos9610.git / commit

author	Ingo Molnar <mingo@elte.hu>
	Mon, 14 Jul 2008 14:11:52 +0000 (16:11 +0200)
committer	Ingo Molnar <mingo@elte.hu>
	Mon, 14 Jul 2008 14:11:52 +0000 (16:11 +0200)
commit	5806b81ac1c0c52665b91723fd4146a4f86e386b
tree	24ea8763bf308ce1407c1de91dc8de4d2655e1c1	tree \| snapshot (tar.gz zip)
parent	d14c8a680ccfdeb5e7b9be4d61162c2b373bd1e8	commit \| diff
parent	6712e299b7dc78aa4971b85e803435ee6d49a9dd	commit \| diff

Merge branch 'auto-ftrace-next' into tracing/for-linus

Conflicts:

arch/x86/kernel/entry_32.S
arch/x86/kernel/process_32.c
arch/x86/kernel/process_64.c
arch/x86/lib/Makefile
include/asm-x86/irqflags.h
kernel/Makefile
kernel/sched.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>

26 files changed:

Makefile	diff1 \|	diff2 \|	blob \| history
arch/x86/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/x86/Kconfig.debug	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/Makefile	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/entry_32.S	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/entry_64.S	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/machine_kexec_32.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/machine_kexec_64.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/process_32.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/process_64.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/vsyscall_64.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/x8664_ksyms_64.c	diff1 \|	diff2 \|	blob \| history
arch/x86/lib/Makefile	diff1 \|	diff2 \|	blob \| history
arch/x86/mm/Makefile	diff1 \|	diff2 \|	blob \| history
arch/x86/mm/fault.c	diff1 \|	diff2 \|	blob \| history
arch/x86/mm/init_32.c	diff1 \|	diff2 \|	blob \| history
arch/x86/mm/init_64.c	diff1 \|	diff2 \|	blob \| history
arch/x86/mm/ioremap.c	diff1 \|	diff2 \|	blob \| history
arch/x86/mm/pageattr.c	diff1 \|	diff2 \|	blob \| history
include/asm-x86/irqflags.h	diff1 \|	diff2 \|	blob \| history
include/linux/linkage.h	diff1 \|	diff2 \|	blob \| history
include/linux/sched.h	diff1 \|	diff2 \|	blob \| history
kernel/Makefile	diff1 \|	diff2 \|	blob \| history
kernel/printk.c	diff1 \|	diff2 \|	blob \| history
kernel/sched.c	diff1 \|	diff2 \|	blob \| history
kernel/sysctl.c	diff1 \|	diff2 \|	blob \| history

RSS Atom

Makefile	diff1 \|	diff2 \|	blob \| history
arch/x86/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/x86/Kconfig.debug	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/Makefile	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/entry_32.S	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/entry_64.S	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/machine_kexec_32.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/machine_kexec_64.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/process_32.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/process_64.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/vsyscall_64.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/x8664_ksyms_64.c	diff1 \|	diff2 \|	blob \| history
arch/x86/lib/Makefile	diff1 \|	diff2 \|	blob \| history
arch/x86/mm/Makefile	diff1 \|	diff2 \|	blob \| history
arch/x86/mm/fault.c	diff1 \|	diff2 \|	blob \| history
arch/x86/mm/init_32.c	diff1 \|	diff2 \|	blob \| history
arch/x86/mm/init_64.c	diff1 \|	diff2 \|	blob \| history
arch/x86/mm/ioremap.c	diff1 \|	diff2 \|	blob \| history
arch/x86/mm/pageattr.c	diff1 \|	diff2 \|	blob \| history
include/asm-x86/irqflags.h	diff1 \|	diff2 \|	blob \| history
include/linux/linkage.h	diff1 \|	diff2 \|	blob \| history
include/linux/sched.h	diff1 \|	diff2 \|	blob \| history
kernel/Makefile	diff1 \|	diff2 \|	blob \| history
kernel/printk.c	diff1 \|	diff2 \|	blob \| history
kernel/sched.c	diff1 \|	diff2 \|	blob \| history
kernel/sysctl.c	diff1 \|	diff2 \|	blob \| history