]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
Merge branch 'linus' into sched/urgent
authorIngo Molnar <mingo@elte.hu>
Mon, 5 Jan 2009 12:53:39 +0000 (13:53 +0100)
committerIngo Molnar <mingo@elte.hu>
Mon, 5 Jan 2009 12:53:39 +0000 (13:53 +0100)
1  2 
kernel/sched_fair.c

Simple merge