]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
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)
Conflicts:
block/blktrace.c

Semantic merge:
kernel/trace/blktrace.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>
1  2 
MAINTAINERS
include/linux/blktrace_api.h
kernel/sched.c
kernel/trace/blktrace.c

diff --cc MAINTAINERS
Simple merge
Simple merge
diff --cc kernel/sched.c
Simple merge
Simple merge