# HG changeset patch
# User iap10@freefall.cl.cam.ac.uk
# Date 1120676116 0
# Node ID d231efdaa66d355f49b42b8b36439cb9108bd0f7
# Parent  33373e428c9d2ad5186d5b967e2fbfd7a6fd3949# Parent  7ca01ac7dee03fb5f196220b31baf6773c8c1b7d
manual merge



diff -r 33373e428c9d -r d231efdaa66d .hgignore
diff -r 33373e428c9d -r d231efdaa66d buildconfigs/mk.linux-2.6-xen
diff -r 33373e428c9d -r d231efdaa66d extras/mini-os/Makefile
diff -r 33373e428c9d -r d231efdaa66d extras/mini-os/events.c
diff -r 33373e428c9d -r d231efdaa66d extras/mini-os/hypervisor.c
diff -r 33373e428c9d -r d231efdaa66d extras/mini-os/include/events.h
diff -r 33373e428c9d -r d231efdaa66d extras/mini-os/include/hypervisor.h
diff -r 33373e428c9d -r d231efdaa66d extras/mini-os/include/lib.h
diff -r 33373e428c9d -r d231efdaa66d extras/mini-os/include/mm.h
diff -r 33373e428c9d -r d231efdaa66d extras/mini-os/include/os.h
diff -r 33373e428c9d -r d231efdaa66d extras/mini-os/include/time.h
diff -r 33373e428c9d -r d231efdaa66d extras/mini-os/include/traps.h
diff -r 33373e428c9d -r d231efdaa66d extras/mini-os/include/types.h
diff -r 33373e428c9d -r d231efdaa66d extras/mini-os/kernel.c
diff -r 33373e428c9d -r d231efdaa66d extras/mini-os/time.c
diff -r 33373e428c9d -r d231efdaa66d extras/mini-os/traps.c
diff -r 33373e428c9d -r d231efdaa66d extras/mini-os/x86_32.S
diff -r 33373e428c9d -r d231efdaa66d linux-2.6.11-xen-sparse/arch/xen/configs/xen0_defconfig_x86_32
diff -r 33373e428c9d -r d231efdaa66d linux-2.6.11-xen-sparse/arch/xen/configs/xenU_defconfig_x86_32
diff -r 33373e428c9d -r d231efdaa66d linux-2.6.11-xen-sparse/arch/xen/configs/xen_defconfig_x86_32
diff -r 33373e428c9d -r d231efdaa66d linux-2.6.11-xen-sparse/drivers/xen/blkback/interface.c
diff -r 33373e428c9d -r d231efdaa66d tools/libxc/xc_linux_build.c
diff -r 33373e428c9d -r d231efdaa66d xen/Makefile