]> pilppa.org Git - linux-2.6-omap-h63xx.git/commit
projects / linux-2.6-omap-h63xx.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 37bd824 ba95fd4)
Merge branch 'linus' into tracing/blktrace
authorIngo Molnar <mingo@elte.hu>
Thu, 19 Feb 2009 08:00:35 +0000 (09:00 +0100)
committerIngo Molnar <mingo@elte.hu>
Thu, 19 Feb 2009 08:00:35 +0000 (09:00 +0100)
commit72c26c9a26ea7f2f3d14f162c2ebb07805f724ea
treebf1b4bc0b69f96c79474f9edb9cf0e811c95f2dctree | snapshot
parent37bd824a35a60abc73e5fa8816bd5f50c913d69bcommit | diff
parentba95fd47d177d46743ad94055908d22840370e06commit | 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 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.