diff options
| author | sos22@labyrinth.cl.cam.ac.uk <sos22@labyrinth.cl.cam.ac.uk> | 2003-07-04 11:23:03 +0000 |
|---|---|---|
| committer | sos22@labyrinth.cl.cam.ac.uk <sos22@labyrinth.cl.cam.ac.uk> | 2003-07-04 11:23:03 +0000 |
| commit | ef3979326b2909d624daeef8c447f5f23482211a (patch) | |
| tree | 8a447850c991965d21594b7c369947ab5f3ea77d /BitKeeper/etc/ignore | |
| parent | 2a5a7f64aeae614e9b59b5b6fb54357a6fd022e1 (diff) | |
| parent | b634c840e3c3d88052e06b080754de8a116a76a7 (diff) | |
| download | xen-ef3979326b2909d624daeef8c447f5f23482211a.tar.gz xen-ef3979326b2909d624daeef8c447f5f23482211a.tar.bz2 xen-ef3979326b2909d624daeef8c447f5f23482211a.zip | |
bitkeeper revision 1.271 (3f056397PcaG7S5EhqWlJo04hQMtfA)
Merge labyrinth.cl.cam.ac.uk:/auto/groups/xeno/users/rac61/xeno.bk
into labyrinth.cl.cam.ac.uk:/auto/groups/xeno/users/sos22/xeno.bk
Diffstat (limited to 'BitKeeper/etc/ignore')
| -rw-r--r-- | BitKeeper/etc/ignore | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/BitKeeper/etc/ignore b/BitKeeper/etc/ignore index 119cbbb8b4..a31719cbf1 100644 --- a/BitKeeper/etc/ignore +++ b/BitKeeper/etc/ignore @@ -232,6 +232,12 @@ tools/internal/xi_create tools/internal/xi_create.o tools/internal/xi_destroy tools/internal/xi_destroy.o +tools/internal/xi_phys_grant +tools/internal/xi_phys_grant.o +tools/internal/xi_phys_probe +tools/internal/xi_phys_probe.o +tools/internal/xi_phys_revoke +tools/internal/xi_phys_revoke.o tools/internal/xi_start tools/internal/xi_start.o tools/internal/xi_stop @@ -408,6 +414,7 @@ xen/include/asm xen/include/hypervisor-ifs/hypervisor-ifs xen/include/linux xen/include/xeno/compile.h +xen/include/xeno/physdisk.h~ xen/net/dev.o xen/net/dev_mcast.o xen/net/devinit.o @@ -419,4 +426,3 @@ xen/tools/figlet/figlet xenolinux-2.4.16-sparse/arch/xeno/drivers/block/Makefile.orig xenolinux-2.4.16-sparse/arch/xeno/drivers/block/block.c.orig xenolinux-2.4.16-sparse/scripts/kconfig.tk -xen/include/xeno/physdisk.h~ |