diff options
| author | mafetter@fleming.research <mafetter@fleming.research> | 2005-04-04 16:13:17 +0000 |
|---|---|---|
| committer | mafetter@fleming.research <mafetter@fleming.research> | 2005-04-04 16:13:17 +0000 |
| commit | 52367cb022232d5d90a84309a4c644a8d55b9e12 (patch) | |
| tree | c7ad801f0615ecd882f2e4cd684a96e92c776602 /BitKeeper/etc | |
| parent | e79bd5b63bc89a3fdb2c7529931d784cf8c436f5 (diff) | |
| parent | 12af2ea309ea8f116483672d9900b863e75f0c7e (diff) | |
| download | xen-52367cb022232d5d90a84309a4c644a8d55b9e12.tar.gz xen-52367cb022232d5d90a84309a4c644a8d55b9e12.tar.bz2 xen-52367cb022232d5d90a84309a4c644a8d55b9e12.zip | |
bitkeeper revision 1.1267 (4251679dHqcry__n_OW9aNhfUtjZ_A)
Hand merged
Signed-off-by: michael.fetterman@cl.cam.ac.uk
Diffstat (limited to 'BitKeeper/etc')
| -rw-r--r-- | BitKeeper/etc/ignore | 9 | ||||
| -rw-r--r-- | BitKeeper/etc/logging_ok | 5 |
2 files changed, 14 insertions, 0 deletions
diff --git a/BitKeeper/etc/ignore b/BitKeeper/etc/ignore index 0817a4ce7f..539e97e1b1 100644 --- a/BitKeeper/etc/ignore +++ b/BitKeeper/etc/ignore @@ -44,6 +44,7 @@ docs/user/internals.pl docs/user/labels.pl docs/user/user.css docs/user/user.html +extras/mini-os/h/hypervisor-ifs extras/mini-os/h/xen-public extras/mini-os/mini-os.* install/* @@ -92,6 +93,11 @@ tools/ioemu/iodev/device-model tools/libxc/xen/* tools/misc/cpuperf/cpuperf-perfcntr tools/misc/cpuperf/cpuperf-xen +tools/misc/mbootpack/bin2c +tools/misc/mbootpack/bootsect +tools/misc/mbootpack/bzimage_header.c +tools/misc/mbootpack/mbootpack +tools/misc/mbootpack/setup tools/misc/miniterm/miniterm tools/misc/xc_shadow tools/misc/xen_cpuperf @@ -111,6 +117,7 @@ tools/xcs/xcsdump tools/xentrace/xentrace tools/xfrd/xfrd xen/BLOG +xen/TAGS xen/arch/x86/asm-offsets.s xen/arch/x86/boot/mkelf32 xen/ddb/* @@ -120,10 +127,12 @@ xen/drivers/pci/gen-devlist xen/figlet/figlet xen/include/asm xen/include/asm-*/asm-offsets.h +xen/include/hypervisor-ifs/arch xen/include/public/public xen/include/xen/*.new xen/include/xen/banner.h xen/include/xen/compile.h +xen/tags xen/tools/elf-reloc xen/tools/figlet/figlet xen/xen diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index e872421227..329e97523d 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -20,7 +20,9 @@ cl349@freefall.cl.cam.ac.uk cl349@labyrinth.cl.cam.ac.uk cwc22@centipede.cl.cam.ac.uk cwc22@donkeykong.cl.cam.ac.uk +djm@djmnc4000.(none) djm@kirby.fc.hp.com +djm@sportsman.spdomain doogie@brainfood.com gm281@boulderdash.cl.cam.ac.uk gm281@tetrapod.cl.cam.ac.uk @@ -50,6 +52,7 @@ kaf24@striker.cl.cam.ac.uk kaf24@viper.(none) kmacy@shemp.lab.netapp.com laudney@eclipse.(none) +leendert@watson.ibm.com lynx@idefix.cl.cam.ac.uk maf46@burn.cl.cam.ac.uk mafetter@fleming.research @@ -72,12 +75,14 @@ rneugeba@wyvis.research.intel-research.net sd386@font.cl.cam.ac.uk shand@spidean.research.intel-research.net smh22@boulderdash.cl.cam.ac.uk +smh22@firebug.cl.cam.ac.uk smh22@labyrinth.cl.cam.ac.uk smh22@tempest.cl.cam.ac.uk smh22@uridium.cl.cam.ac.uk sos22@donkeykong.cl.cam.ac.uk sos22@douglas.cl.cam.ac.uk sos22@labyrinth.cl.cam.ac.uk +tjd21@arcadians.cl.cam.ac.uk tlh20@elite.cl.cam.ac.uk tlh20@labyrinth.cl.cam.ac.uk tw275@labyrinth.cl.cam.ac.uk |