ia64/xen-unstable

changeset 9:cfc178f9384e

bitkeeper revision 1.8 (3dec9c90XyJIr99XUErie7A1ZB6G4Q)

Merge uridium.cl.cam.ac.uk:/usr/groups/xeno/BK/xeno
into uridium.cl.cam.ac.uk:/anfs/scratch/boulderdash/smh22/xeno.bk
author smh22@uridium.cl.cam.ac.uk
date Tue Dec 03 11:59:12 2002 +0000 (2002-12-03)
parents 6adfe177d29b
children 19dcb7010a45
files .bk-to-hg .hg-to-bk .rootkeys BitKeeper/etc/logging_ok
line diff
     1.1 --- a/.bk-to-hg	Mon Dec 02 20:15:42 2002 +0000
     1.2 +++ b/.bk-to-hg	Tue Dec 03 11:59:12 2002 +0000
     1.3 @@ -1,6 +1,6 @@
     1.4  #!/bin/sh -x
     1.5  set -e
     1.6 -test -L xenolinux-2.4.16-sparse/include/asm-xeno/hypervisor-ifs
     1.7 -rm      xenolinux-2.4.16-sparse/include/asm-xeno/hypervisor-ifs
     1.8 +test -L foo
     1.9 +rm      foo
    1.10  (find -depth -type d -print | xargs -r rmdir 2>/dev/null) || true
    1.11  exit 0
     2.1 --- a/.hg-to-bk	Mon Dec 02 20:15:42 2002 +0000
     2.2 +++ b/.hg-to-bk	Tue Dec 03 11:59:12 2002 +0000
     2.3 @@ -1,8 +1,5 @@
     2.4  #!/bin/sh -x
     2.5  set -e
     2.6 -mkdir -p xenolinux-2.4.16-sparse
     2.7 -mkdir -p xenolinux-2.4.16-sparse/include
     2.8 -mkdir -p xenolinux-2.4.16-sparse/include/asm-xeno
     2.9 -ln -s ../../../xen-2.4.16/include/hypervisor-ifs/ xenolinux-2.4.16-sparse/include/asm-xeno/hypervisor-ifs
    2.10 +ln -s ../../../xen-2.4.16/include/hypervisor-ifs/ foo
    2.11  (find -depth -type d -print | xargs -r rmdir 2>/dev/null) || true
    2.12  exit 0
     3.1 --- a/.rootkeys	Mon Dec 02 20:15:42 2002 +0000
     3.2 +++ b/.rootkeys	Tue Dec 03 11:59:12 2002 +0000
     3.3 @@ -1,6 +1,7 @@
     3.4  3ddb6b0bKlMz_dz-M59a1mkUa1lASw BitKeeper/etc/config
     3.5  3ddb6b0buTaC5zg1_a8FoAR9FWi_mw BitKeeper/etc/ignore
     3.6  3ddb79c9_hgSp-gsQm8HqWM_9W3B_A BitKeeper/etc/logging_ok
     3.7 +3deb3f5bhXnxocVMiXaeZ0L7fQBGaw foo
     3.8  3ddb79bcbOVHh38VJzc97-JEGD4dJQ xen-2.4.16/Makefile
     3.9  3ddb79bcCa2VbsMp7mWKlhgwLQUQGA xen-2.4.16/README
    3.10  3ddb79bcWnTwYsQRWl_PaneJfa6p0w xen-2.4.16/Rules.mk
    3.11 @@ -316,7 +317,6 @@ 3ddb79bas-nFywnmilbUeT34PEAA0g xenolinux
    3.12  3ddb79batzR40ZFY9dvgs5f1aM9I6g xenolinux-2.4.16-sparse/include/asm-xeno/hdreg.h
    3.13  3ddb79b90xBgbeYgCcImS2ZxJakxBA xenolinux-2.4.16-sparse/include/asm-xeno/highmem.h
    3.14  3ddb79baXLZV3dUKQI2gIYpAy67RuA xenolinux-2.4.16-sparse/include/asm-xeno/hw_irq.h
    3.15 -3deb3f5bhXnxocVMiXaeZ0L7fQBGaw xenolinux-2.4.16-sparse/include/asm-xeno/hypervisor-ifs
    3.16  3ddb79bapQ9Z9ewa5O1pqAVaNBTazg xenolinux-2.4.16-sparse/include/asm-xeno/hypervisor.h
    3.17  3ddb79baL-pjPI8hg5xjPgd4__SlOA xenolinux-2.4.16-sparse/include/asm-xeno/i387.h
    3.18  3ddb79ba66TwvG7HpbBo04fRhmj3KQ xenolinux-2.4.16-sparse/include/asm-xeno/ide.h
     4.1 --- a/BitKeeper/etc/logging_ok	Mon Dec 02 20:15:42 2002 +0000
     4.2 +++ b/BitKeeper/etc/logging_ok	Tue Dec 03 11:59:12 2002 +0000
     4.3 @@ -2,3 +2,4 @@ akw27@boulderdash.cl.cam.ac.uk
     4.4  kaf24@plym.cl.cam.ac.uk
     4.5  kaf24@striker.cl.cam.ac.uk
     4.6  smh22@boulderdash.cl.cam.ac.uk
     4.7 +smh22@uridium.cl.cam.ac.uk