Merge branch 'linus' into sched/urgent
authorIngo Molnar <mingo@elte.hu>
Mon, 23 Jun 2008 09:00:26 +0000 (11:00 +0200)
committerIngo Molnar <mingo@elte.hu>
Mon, 23 Jun 2008 09:00:26 +0000 (11:00 +0200)
commit198bb971e256e4167e45e7df643c13ea66f67e3a
tree85b8b2bf6cc78bf0e53a2187ed5796f076922334
parentea71a546706dfdad72462624394e1e472c6bf34f
parent481c5346d0981940ee63037eb53e4e37b0735c10
Merge branch 'linus' into sched/urgent
kernel/sched.c