diff options
| author | sos22@labyrinth.cl.cam.ac.uk <sos22@labyrinth.cl.cam.ac.uk> | 2003-07-10 09:24:39 +0000 |
|---|---|---|
| committer | sos22@labyrinth.cl.cam.ac.uk <sos22@labyrinth.cl.cam.ac.uk> | 2003-07-10 09:24:39 +0000 |
| commit | ace479e9e12f2d6a2cea4b6efa1a1ca0b09bc0f4 (patch) | |
| tree | 299aa4e11e225bde086e847c16122e632f0520e2 /BitKeeper | |
| parent | 3e755f61e126e75d388f3a38eaa350451aedd96c (diff) | |
| parent | 0a624b92706c52b3bc4c1acf6d96c008f2779027 (diff) | |
| download | xen-ace479e9e12f2d6a2cea4b6efa1a1ca0b09bc0f4.tar.gz xen-ace479e9e12f2d6a2cea4b6efa1a1ca0b09bc0f4.tar.bz2 xen-ace479e9e12f2d6a2cea4b6efa1a1ca0b09bc0f4.zip | |
bitkeeper revision 1.329 (3f0d30d74QKz0HxzOWPKez8__UdvjQ)
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')
| -rw-r--r-- | BitKeeper/etc/ignore | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/BitKeeper/etc/ignore b/BitKeeper/etc/ignore index f41769eb43..71eac81846 100644 --- a/BitKeeper/etc/ignore +++ b/BitKeeper/etc/ignore @@ -358,8 +358,15 @@ xen/drivers/ide/ide-xeno.o xen/drivers/ide/ide.o xen/drivers/ide/piix.o xen/drivers/net/3c59x.o +xen/drivers/net/8139too.o xen/drivers/net/Space.o xen/drivers/net/driver.o +xen/drivers/net/e100/e100.o +xen/drivers/net/e100/e100_config.o +xen/drivers/net/e100/e100_eeprom.o +xen/drivers/net/e100/e100_main.o +xen/drivers/net/e100/e100_phy.o +xen/drivers/net/e100/e100_test.o xen/drivers/net/e1000/e1000.o xen/drivers/net/e1000/e1000_ethtool.o xen/drivers/net/e1000/e1000_hw.o @@ -369,8 +376,19 @@ xen/drivers/net/ne/8390.o xen/drivers/net/ne/ne.o xen/drivers/net/ne/ne_drv.o xen/drivers/net/net_init.o +xen/drivers/net/pcnet32.o xen/drivers/net/setup.o xen/drivers/net/tg3.o +xen/drivers/net/tulip/21142.o +xen/drivers/net/tulip/eeprom.o +xen/drivers/net/tulip/interrupt.o +xen/drivers/net/tulip/media.o +xen/drivers/net/tulip/pnic.o +xen/drivers/net/tulip/pnic2.o +xen/drivers/net/tulip/timer.o +xen/drivers/net/tulip/tulip.o +xen/drivers/net/tulip/tulip_core.o +xen/drivers/net/via-rhine.o xen/drivers/pci/classlist.h xen/drivers/pci/compat.o xen/drivers/pci/devlist.h @@ -439,21 +457,3 @@ xenolinux-2.4.21-sparse/arch/xeno/drivers/block/xl_block.c~ xenolinux-2.4.21-sparse/arch/xeno/drivers/block/xl_physdisk_proc.c.bak xenolinux-2.4.21-sparse/arch/xeno/drivers/block/xl_physdisk_proc.c~ xenolinux-2.4.21-sparse/include/linux/blk.h~ -xen/drivers/net/8139too.o -xen/drivers/net/pcnet32.o -xen/drivers/net/via-rhine.o -xen/drivers/net/e100/e100.o -xen/drivers/net/e100/e100_config.o -xen/drivers/net/e100/e100_eeprom.o -xen/drivers/net/e100/e100_main.o -xen/drivers/net/e100/e100_phy.o -xen/drivers/net/e100/e100_test.o -xen/drivers/net/tulip/21142.o -xen/drivers/net/tulip/eeprom.o -xen/drivers/net/tulip/interrupt.o -xen/drivers/net/tulip/media.o -xen/drivers/net/tulip/pnic.o -xen/drivers/net/tulip/pnic2.o -xen/drivers/net/tulip/timer.o -xen/drivers/net/tulip/tulip.o -xen/drivers/net/tulip/tulip_core.o |