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)
1  2 
kernel/cpuset.c
kernel/sched.c

diff --cc kernel/cpuset.c
Simple merge
diff --cc kernel/sched.c
Simple merge