]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commitdiff
Merge branch 'linus' into sched/devel
authorIngo Molnar <mingo@elte.hu>
Tue, 26 Aug 2008 08:25:59 +0000 (10:25 +0200)
committerIngo Molnar <mingo@elte.hu>
Tue, 26 Aug 2008 08:25:59 +0000 (10:25 +0200)
1  2 
kernel/sched.c

diff --cc kernel/sched.c
Simple merge