Merge branch 'linus' into sched/new-API-sched_setscheduler
authorIngo Molnar <mingo@elte.hu>
Wed, 25 Jun 2008 10:27:05 +0000 (12:27 +0200)
committerIngo Molnar <mingo@elte.hu>
Wed, 25 Jun 2008 10:27:05 +0000 (12:27 +0200)
commit773dc8eacaedb2e8c8d0defb5de2c66ea7dc4a08
tree1bfa945dcfbcc4a60e31714f768ef38155c621d3
parent961ccddd59d627b89bd3dc284b6517833bbdf25d
parent543cf4cb3fe6f6cae3651ba918b9c56200b257d0
Merge branch 'linus' into sched/new-API-sched_setscheduler
kernel/sched.c