]> err.no Git - linux-2.6/commitdiff
Merge commit 'v2.6.26' into sched/devel
authorIngo Molnar <mingo@elte.hu>
Mon, 14 Jul 2008 10:19:19 +0000 (12:19 +0200)
committerIngo Molnar <mingo@elte.hu>
Mon, 14 Jul 2008 10:19:19 +0000 (12:19 +0200)
1  2 
kernel/cpuset.c

diff --cc kernel/cpuset.c
Simple merge