Merge branch 'linus' into core/softlockup
Ingo Molnar [Mon, 16 Jun 2008 09:24:43 +0000 (11:24 +0200)]
1  2 
include/linux/sched.h

Simple merge