Merge branch 'linus' into sched/devel
authorIngo Molnar <mingo@elte.hu>
Sat, 6 Sep 2008 14:51:57 +0000 (16:51 +0200)
committerIngo Molnar <mingo@elte.hu>
Sat, 6 Sep 2008 14:51:57 +0000 (16:51 +0200)
commit7f79d852ed30a06eebf7497afe9334a726db3d40
tree0057281f17501b635d3d88cda9a14203706f5dcc
parentaef745fca016aea45adae5c98e8698904dd8ad51
parent70bb08962ea9bd50797ae9f16b2493f5f7c65053
Merge branch 'linus' into sched/devel
include/linux/sched.h
kernel/sched.c