Merge branch 'tip/perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/roste...
Ingo Molnar [Fri, 27 May 2011 12:28:09 +0000 (14:28 +0200)]
1  2 
include/linux/sched.h

Simple merge