ia64/xen-unstable

changeset 5688:d231efdaa66d

manual merge
author iap10@freefall.cl.cam.ac.uk
date Wed Jul 06 18:55:16 2005 +0000 (2005-07-06)
parents 33373e428c9d 7ca01ac7dee0
children 1c119c875f21
files .hgignore buildconfigs/mk.linux-2.6-xen extras/mini-os/Makefile extras/mini-os/events.c extras/mini-os/hypervisor.c extras/mini-os/include/events.h extras/mini-os/include/hypervisor.h extras/mini-os/include/lib.h extras/mini-os/include/mm.h extras/mini-os/include/os.h extras/mini-os/include/time.h extras/mini-os/include/traps.h extras/mini-os/include/types.h extras/mini-os/kernel.c extras/mini-os/time.c extras/mini-os/traps.c extras/mini-os/x86_32.S linux-2.6.11-xen-sparse/arch/xen/configs/xen0_defconfig_x86_32 linux-2.6.11-xen-sparse/arch/xen/configs/xenU_defconfig_x86_32 linux-2.6.11-xen-sparse/arch/xen/configs/xen_defconfig_x86_32 linux-2.6.11-xen-sparse/drivers/xen/blkback/interface.c tools/libxc/xc_linux_build.c xen/Makefile
line diff