From 2157b0ba8b467d175588a39d0235e3f42cfa0167 Mon Sep 17 00:00:00 2001
From: Niklas Hallqvist <niklas@cvs.openbsd.org>
Date: Thu, 18 Sep 1997 13:40:05 +0000
Subject: Merge of NetBSD changes upto last week or so, with the exception of
 stand/

---
 sys/arch/amiga/dev/if_ed.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'sys/arch/amiga/dev/if_ed.c')

diff --git a/sys/arch/amiga/dev/if_ed.c b/sys/arch/amiga/dev/if_ed.c
index e918ba94219..8244c5d7590 100644
--- a/sys/arch/amiga/dev/if_ed.c
+++ b/sys/arch/amiga/dev/if_ed.c
@@ -1,5 +1,5 @@
-/*	$OpenBSD: if_ed.c,v 1.10 1997/02/21 11:08:48 niklas Exp $	*/
-/*	$NetBSD: if_ed.c,v 1.24 1996/12/23 09:10:16 veego Exp $	*/
+/*	$OpenBSD: if_ed.c,v 1.11 1997/09/18 13:39:56 niklas Exp $	*/
+/*	$NetBSD: if_ed.c,v 1.26 1997/03/17 17:51:42 is Exp $	*/
 
 /*
  * Device driver for National Semiconductor DS8390/WD83C690 based ethernet
-- 
cgit v1.2.3