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)
commit5e34437840d33554f69380584311743b39e8fbeb
treee081135619ee146af5efb9ee883afca950df5757
parent77d05632baee21b1cef8730d7c06aa69601e4dca
parentd508afb437daee7cf07da085b635c44a4ebf9b38
Merge branch 'linus' into core/softlockup

Conflicts:
kernel/sysctl.c
include/linux/sched.h
kernel/Makefile
kernel/fork.c
kernel/sysctl.c
lib/Kconfig.debug