projects / xen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b1ea6b0 68daa78)
bitkeeper revision 1.920 (40ade0a9XXfWXJDrdcZG4y_gJyXZZw)
authoriap10@labyrinth.cl.cam.ac.uk <iap10@labyrinth.cl.cam.ac.uk>
Fri, 21 May 2004 10:57:45 +0000 (10:57 +0000)
committeriap10@labyrinth.cl.cam.ac.uk <iap10@labyrinth.cl.cam.ac.uk>
Fri, 21 May 2004 10:57:45 +0000 (10:57 +0000)
Merge labyrinth.cl.cam.ac.uk:/auto/homes/maw48/xeno-schedfix.bk
into labyrinth.cl.cam.ac.uk:/auto/groups/xeno/users/iap10/xeno-clone/xeno.bk

1  2 
xen/common/sched_bvt.c patch | diff1 | diff2 | blob | history
xen/common/schedule.c patch | diff1 | diff2 | blob | history

diff --cc xen/common/sched_bvt.c
Simple merge
diff --cc xen/common/schedule.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.