git.stricted.de - GitHub/LineageOS/android_kernel_motorola_exynos9610.git/commit

projects / GitHub / LineageOS / android_kernel_motorola_exynos9610.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 37bd824 ba95fd4)

author	Ingo Molnar <mingo@elte.hu>
	Thu, 19 Feb 2009 08:00:35 +0000 (09:00 +0100)
committer	Ingo Molnar <mingo@elte.hu>
	Thu, 19 Feb 2009 08:00:35 +0000 (09:00 +0100)
commit	72c26c9a26ea7f2f3d14f162c2ebb07805f724ea
tree	bf1b4bc0b69f96c79474f9edb9cf0e811c95f2dc	tree \| snapshot (tar.gz zip)
parent	37bd824a35a60abc73e5fa8816bd5f50c913d69b	commit \| diff
parent	ba95fd47d177d46743ad94055908d22840370e06	commit \| diff

Merge branch 'linus' into tracing/blktrace

Conflicts:
block/blktrace.c

Semantic merge:
kernel/trace/blktrace.c

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

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
include/linux/blktrace_api.h	diff1 \|	diff2 \|	blob \| history
kernel/sched.c	diff1 \|	diff2 \|	blob \| history
kernel/trace/blktrace.c	diff1 \|	\|	blob \| history