Merge branch 'master' into next
James Morris [Wed, 5 Aug 2009 22:55:03 +0000 (08:55 +1000)]
1  2 
include/linux/sched.h

Simple merge