]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
Merge branch 'linus' into cpus4096
authorIngo Molnar <mingo@elte.hu>
Tue, 2 Dec 2008 19:09:50 +0000 (20:09 +0100)
committerIngo Molnar <mingo@elte.hu>
Tue, 2 Dec 2008 19:09:50 +0000 (20:09 +0100)
Conflicts:
kernel/trace/ring_buffer.c

1  2 
arch/x86/kernel/Makefile
include/linux/sched.h
kernel/profile.c
kernel/sched.c
kernel/sysctl.c

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