]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
Merge branch 'linus' into sched/clock
authorIngo Molnar <mingo@elte.hu>
Mon, 11 Aug 2008 06:59:21 +0000 (08:59 +0200)
committerIngo Molnar <mingo@elte.hu>
Mon, 11 Aug 2008 06:59:21 +0000 (08:59 +0200)
1  2 
kernel/sched.c

diff --cc kernel/sched.c
Simple merge