Merge branch 'linus' into sched/clock
authorIngo Molnar <mingo@elte.hu>
Mon, 11 Aug 2008 06:59:21 +0000 (08:59 +0200)
committerIngo Molnar <mingo@elte.hu>
Mon, 11 Aug 2008 06:59:21 +0000 (08:59 +0200)
commitcf206bffbb7542df54043fad9898113172af99d8
treec7e7ca9a93443b888f98a0c07e74751a1aa3c947
parentc1955a3d4762e7a9bf84035eb3c4886a900f0d15
parent796aadeb1b2db9b5d463946766c5bbfd7717158c
Merge branch 'linus' into sched/clock
kernel/sched.c