projects / xen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 11c23ee 49c6b7c)
bitkeeper revision 1.905 (40a3a6de5FuSwJGHH_WcDAjtx8enEA)
authoriap10@labyrinth.cl.cam.ac.uk <iap10@labyrinth.cl.cam.ac.uk>
Thu, 13 May 2004 16:48:30 +0000 (16:48 +0000)
committeriap10@labyrinth.cl.cam.ac.uk <iap10@labyrinth.cl.cam.ac.uk>
Thu, 13 May 2004 16:48:30 +0000 (16:48 +0000)
Merge labyrinth.cl.cam.ac.uk:/auto/groups/xeno/BK/xeno.bk
into labyrinth.cl.cam.ac.uk:/auto/groups/xeno/users/iap10/xeno-clone/xeno.bk

1  2 
xen/common/domain.c patch | diff1 | diff2 | blob | history
xen/common/memory.c patch | diff1 | diff2 | blob | history
xenolinux-2.4.26-sparse/include/asm-xen/hypervisor.h patch | diff1 | diff2 | blob | history

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