git.stricted.de - GitHub/LineageOS/G12/android_kernel_amlogic_linux-4.9.git/commit

projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 3612fdf fec6c6f)

author	Ingo Molnar <mingo@elte.hu>
	Wed, 4 Mar 2009 10:14:47 +0000 (11:14 +0100)
committer	Ingo Molnar <mingo@elte.hu>
	Wed, 4 Mar 2009 10:14:47 +0000 (11:14 +0100)
commit	a1be621dfacbef0fd374d8acd553d71e07bf29ac
tree	32b0355454b43b1098b5e01dd699fd7281abf781	tree \| snapshot (tar.gz zip)
parent	3612fdf780e28b10323dd12d2b0f306c7ada4d4c	commit \| diff
parent	fec6c6fec3e20637bee5d276fb61dd8b49a3f9cc	commit \| diff

Merge branch 'tracing/ftrace'; commit 'v2.6.29-rc7' into tracing/core

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
arch/x86/mm/init_64.c	diff1 \|	diff2 \|	blob \| history
include/linux/sched.h	diff1 \|	diff2 \|	blob \| history
init/main.c	diff1 \|	diff2 \|	blob \| history
kernel/sched.c	diff1 \|	diff2 \|	blob \| history