]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
Merge branch 'linus' into core/softlockup
authorIngo Molnar <mingo@elte.hu>
Tue, 7 Apr 2009 09:15:40 +0000 (11:15 +0200)
committerIngo Molnar <mingo@elte.hu>
Tue, 7 Apr 2009 09:15:40 +0000 (11:15 +0200)
Conflicts:
kernel/sysctl.c

1  2 
include/linux/sched.h
kernel/Makefile
kernel/fork.c
kernel/sysctl.c
lib/Kconfig.debug

Simple merge
diff --cc kernel/Makefile
Simple merge
diff --cc kernel/fork.c
Simple merge
diff --cc kernel/sysctl.c
Simple merge
Simple merge