projects / xen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a247c26 06f98cc)
bitkeeper revision 1.1236.12.15 (422e5a69zhiLV3Xbq3D-aL20QlyddA)
authorcl349@firebug.cl.cam.ac.uk <cl349@firebug.cl.cam.ac.uk>
Wed, 9 Mar 2005 02:07:37 +0000 (02:07 +0000)
committercl349@firebug.cl.cam.ac.uk <cl349@firebug.cl.cam.ac.uk>
Wed, 9 Mar 2005 02:07:37 +0000 (02:07 +0000)
Merge firebug.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-2.0-testing.bk
into firebug.cl.cam.ac.uk:/local/scratch/cl349/netbsd/xen-unstable.bk

1  2 
buildconfigs/Rules.mk patch | diff1 | diff2 | blob | history
netbsd-2.0-xen-sparse/sys/arch/xen/i386/locore.S patch | diff1 | diff2 | blob | history
netbsd-2.0-xen-sparse/sys/arch/xen/i386/machdep.c patch | diff1 | diff2 | blob | history

diff --cc buildconfigs/Rules.mk
Simple merge
Unnamed repository; edit this file 'description' to name the repository.