Merge branch 'linus' into sched/devel
authorIngo Molnar <mingo@elte.hu>
Mon, 23 Jun 2008 09:30:23 +0000 (11:30 +0200)
committerIngo Molnar <mingo@elte.hu>
Mon, 23 Jun 2008 09:30:23 +0000 (11:30 +0200)
commit1de8644cc7c826e0c41e52825bd5a12e2e31e6ca
treedf1e884080599facaf70d2675c480e999da953e1
parent6c3df25511c2c51f2dd36cc52a8d22363d731793
parent481c5346d0981940ee63037eb53e4e37b0735c10
Merge branch 'linus' into sched/devel
kernel/cpuset.c
kernel/sched.c