source-changes: NetBSD master CVS tree commits

Subject: NetBSD master CVS tree commits
To: None <source-changes@NetBSD.ORG>
From: None <source@NetBSD.ORG>
List: source-changes
Date: 05/04/1997 15:20:04
mrg
Sun May  4 08:10:25 PDT 1997
Update of /cvsroot/src/include
In directory netbsd1:/var/slash-tmp/cvs-serv2939

Modified Files:
      Tag: mrg-vm-swap2
	unistd.h 
Log Message:
re-merge mrg-vm-swap into -current, and call it mrg-vm-swap2.

mrg
Sun May  4 08:10:38 PDT 1997
Update of /cvsroot/src/usr.sbin/ipf
In directory netbsd1:/var/slash-tmp/cvs-serv2986

Added Files:
	ipfilter2netbsd 
Log Message:
move ipfilter2netbsd, and remove extra copies of opt.c that got added.

mrg
Sun May  4 08:10:40 PDT 1997
Update of /cvsroot/src/usr.sbin/ipf/ipf
In directory netbsd1:/var/slash-tmp/cvs-serv2986/ipf

Removed Files:
	ipfilter2netbsd 
Log Message:
move ipfilter2netbsd, and remove extra copies of opt.c that got added.

mrg
Sun May  4 08:10:43 PDT 1997
Update of /cvsroot/src/usr.sbin/ipf/ipfstat
In directory netbsd1:/var/slash-tmp/cvs-serv2986/ipfstat

Removed Files:
	opt.c 
Log Message:
move ipfilter2netbsd, and remove extra copies of opt.c that got added.

mrg
Sun May  4 08:10:46 PDT 1997
Update of /cvsroot/src/usr.sbin/ipf/ipftest
In directory netbsd1:/var/slash-tmp/cvs-serv2986/ipftest

Removed Files:
	opt.c 
Log Message:
move ipfilter2netbsd, and remove extra copies of opt.c that got added.

mrg
Sun May  4 08:18:30 PDT 1997
Update of /cvsroot/src/sys/arch/alpha/alpha
In directory netbsd1:/var/slash-tmp/cvs-serv3179/arch/alpha/alpha

Modified Files:
      Tag: mrg-vm-swap2
	machdep.c 
Log Message:
re-merge mrg-vm-swap into -current, and call it mrg-vm-swap2.

mrg
Sun May  4 08:18:32 PDT 1997
Update of /cvsroot/src/sys/arch/alpha/include
In directory netbsd1:/var/slash-tmp/cvs-serv3179/arch/alpha/include

Modified Files:
      Tag: mrg-vm-swap2
	vmparam.h 
Log Message:
re-merge mrg-vm-swap into -current, and call it mrg-vm-swap2.

mrg
Sun May  4 08:18:37 PDT 1997
Update of /cvsroot/src/sys/arch/amiga/amiga
In directory netbsd1:/var/slash-tmp/cvs-serv3179/arch/amiga/amiga

Modified Files:
      Tag: mrg-vm-swap2
	machdep.c 
Log Message:
re-merge mrg-vm-swap into -current, and call it mrg-vm-swap2.

mrg
Sun May  4 08:18:39 PDT 1997
Update of /cvsroot/src/sys/arch/amiga/include
In directory netbsd1:/var/slash-tmp/cvs-serv3179/arch/amiga/include

Modified Files:
      Tag: mrg-vm-swap2
	vmparam.h 
Log Message:
re-merge mrg-vm-swap into -current, and call it mrg-vm-swap2.

mrg
Sun May  4 08:18:43 PDT 1997
Update of /cvsroot/src/sys/arch/arm32/arm32
In directory netbsd1:/var/slash-tmp/cvs-serv3179/arch/arm32/arm32

Modified Files:
      Tag: mrg-vm-swap2
	machdep.c 
Log Message:
re-merge mrg-vm-swap into -current, and call it mrg-vm-swap2.

mrg
Sun May  4 08:18:46 PDT 1997
Update of /cvsroot/src/sys/arch/arm32/include
In directory netbsd1:/var/slash-tmp/cvs-serv3179/arch/arm32/include

Modified Files:
      Tag: mrg-vm-swap2
	vmparam.h 
Log Message:
re-merge mrg-vm-swap into -current, and call it mrg-vm-swap2.

mrg
Sun May  4 08:18:49 PDT 1997
Update of /cvsroot/src/sys/arch/atari/atari
In directory netbsd1:/var/slash-tmp/cvs-serv3179/arch/atari/atari

Modified Files:
      Tag: mrg-vm-swap2
	machdep.c 
Log Message:
re-merge mrg-vm-swap into -current, and call it mrg-vm-swap2.

mrg
Sun May  4 08:18:53 PDT 1997
Update of /cvsroot/src/sys/arch/atari/include
In directory netbsd1:/var/slash-tmp/cvs-serv3179/arch/atari/include

Modified Files:
      Tag: mrg-vm-swap2
	vmparam.h 
Log Message:
re-merge mrg-vm-swap into -current, and call it mrg-vm-swap2.

mrg
Sun May  4 08:18:56 PDT 1997
Update of /cvsroot/src/sys/arch/hp300/hp300
In directory netbsd1:/var/slash-tmp/cvs-serv3179/arch/hp300/hp300

Modified Files:
      Tag: mrg-vm-swap2
	machdep.c 
Log Message:
re-merge mrg-vm-swap into -current, and call it mrg-vm-swap2.

mrg
Sun May  4 08:18:58 PDT 1997
Update of /cvsroot/src/sys/arch/hp300/include
In directory netbsd1:/var/slash-tmp/cvs-serv3179/arch/hp300/include

Modified Files:
      Tag: mrg-vm-swap2
	vmparam.h 
Log Message:
re-merge mrg-vm-swap into -current, and call it mrg-vm-swap2.

mrg
Sun May  4 08:19:02 PDT 1997
Update of /cvsroot/src/sys/arch/i386/i386
In directory netbsd1:/var/slash-tmp/cvs-serv3179/arch/i386/i386

Modified Files:
      Tag: mrg-vm-swap2
	machdep.c 
Log Message:
re-merge mrg-vm-swap into -current, and call it mrg-vm-swap2.

mrg
Sun May  4 08:19:04 PDT 1997
Update of /cvsroot/src/sys/arch/i386/include
In directory netbsd1:/var/slash-tmp/cvs-serv3179/arch/i386/include

Modified Files:
      Tag: mrg-vm-swap2
	vmparam.h 
Log Message:
re-merge mrg-vm-swap into -current, and call it mrg-vm-swap2.

mrg
Sun May  4 08:19:07 PDT 1997
Update of /cvsroot/src/sys/arch/mac68k/include
In directory netbsd1:/var/slash-tmp/cvs-serv3179/arch/mac68k/include

Modified Files:
      Tag: mrg-vm-swap2
	vmparam.h 
Log Message:
re-merge mrg-vm-swap into -current, and call it mrg-vm-swap2.

mrg
Sun May  4 08:19:10 PDT 1997
Update of /cvsroot/src/sys/arch/mac68k/mac68k
In directory netbsd1:/var/slash-tmp/cvs-serv3179/arch/mac68k/mac68k

Modified Files:
      Tag: mrg-vm-swap2
	machdep.c 
Log Message:
re-merge mrg-vm-swap into -current, and call it mrg-vm-swap2.

mrg
Sun May  4 08:19:13 PDT 1997
Update of /cvsroot/src/sys/arch/mips/include
In directory netbsd1:/var/slash-tmp/cvs-serv3179/arch/mips/include

Modified Files:
      Tag: mrg-vm-swap2
	vmparam.h 
Log Message:
re-merge mrg-vm-swap into -current, and call it mrg-vm-swap2.

mrg
Sun May  4 08:19:15 PDT 1997
Update of /cvsroot/src/sys/arch/mvme68k/include
In directory netbsd1:/var/slash-tmp/cvs-serv3179/arch/mvme68k/include

Modified Files:
      Tag: mrg-vm-swap2
	vmparam.h 
Log Message:
re-merge mrg-vm-swap into -current, and call it mrg-vm-swap2.

mrg
Sun May  4 08:19:17 PDT 1997
Update of /cvsroot/src/sys/arch/mvme68k/mvme68k
In directory netbsd1:/var/slash-tmp/cvs-serv3179/arch/mvme68k/mvme68k

Modified Files:
      Tag: mrg-vm-swap2
	machdep.c 
Log Message:
re-merge mrg-vm-swap into -current, and call it mrg-vm-swap2.

mrg
Sun May  4 08:19:20 PDT 1997
Update of /cvsroot/src/sys/arch/pc532/include
In directory netbsd1:/var/slash-tmp/cvs-serv3179/arch/pc532/include

Modified Files:
      Tag: mrg-vm-swap2
	vmparam.h 
Log Message:
re-merge mrg-vm-swap into -current, and call it mrg-vm-swap2.

mrg
Sun May  4 08:19:24 PDT 1997
Update of /cvsroot/src/sys/arch/pc532/pc532
In directory netbsd1:/var/slash-tmp/cvs-serv3179/arch/pc532/pc532

Modified Files:
      Tag: mrg-vm-swap2
	machdep.c 
Log Message:
re-merge mrg-vm-swap into -current, and call it mrg-vm-swap2.

mrg
Sun May  4 08:19:27 PDT 1997
Update of /cvsroot/src/sys/arch/pica/pica
In directory netbsd1:/var/slash-tmp/cvs-serv3179/arch/pica/pica

Modified Files:
      Tag: mrg-vm-swap2
	machdep.c 
Log Message:
re-merge mrg-vm-swap into -current, and call it mrg-vm-swap2.

mrg
Sun May  4 08:19:30 PDT 1997
Update of /cvsroot/src/sys/arch/pmax/pmax
In directory netbsd1:/var/slash-tmp/cvs-serv3179/arch/pmax/pmax

Modified Files:
      Tag: mrg-vm-swap2
	machdep.c 
Log Message:
re-merge mrg-vm-swap into -current, and call it mrg-vm-swap2.

mrg
Sun May  4 08:19:32 PDT 1997
Update of /cvsroot/src/sys/arch/powerpc/include
In directory netbsd1:/var/slash-tmp/cvs-serv3179/arch/powerpc/include

Modified Files:
      Tag: mrg-vm-swap2
	vmparam.h 
Log Message:
re-merge mrg-vm-swap into -current, and call it mrg-vm-swap2.

mrg
Sun May  4 08:19:33 PDT 1997
Update of /cvsroot/src/sys/arch/powerpc/powerpc
In directory netbsd1:/var/slash-tmp/cvs-serv3179/arch/powerpc/powerpc

Modified Files:
      Tag: mrg-vm-swap2
	machdep.c 
Log Message:
re-merge mrg-vm-swap into -current, and call it mrg-vm-swap2.

mrg
Sun May  4 08:19:36 PDT 1997
Update of /cvsroot/src/sys/arch/sparc/include
In directory netbsd1:/var/slash-tmp/cvs-serv3179/arch/sparc/include

Modified Files:
      Tag: mrg-vm-swap2
	vmparam.h 
Log Message:
re-merge mrg-vm-swap into -current, and call it mrg-vm-swap2.

mrg
Sun May  4 08:19:38 PDT 1997
Update of /cvsroot/src/sys/arch/sparc/sparc
In directory netbsd1:/var/slash-tmp/cvs-serv3179/arch/sparc/sparc

Modified Files:
      Tag: mrg-vm-swap2
	machdep.c 
Log Message:
re-merge mrg-vm-swap into -current, and call it mrg-vm-swap2.

mrg
Sun May  4 08:19:41 PDT 1997
Update of /cvsroot/src/sys/arch/sun3/include
In directory netbsd1:/var/slash-tmp/cvs-serv3179/arch/sun3/include

Modified Files:
      Tag: mrg-vm-swap2
	vmparam.h 
Log Message:
re-merge mrg-vm-swap into -current, and call it mrg-vm-swap2.

mrg
Sun May  4 08:19:44 PDT 1997
Update of /cvsroot/src/sys/arch/sun3/sun3
In directory netbsd1:/var/slash-tmp/cvs-serv3179/arch/sun3/sun3

Modified Files:
      Tag: mrg-vm-swap2
	machdep.c 
Log Message:
re-merge mrg-vm-swap into -current, and call it mrg-vm-swap2.

mrg
Sun May  4 08:19:46 PDT 1997
Update of /cvsroot/src/sys/arch/sun3x/include
In directory netbsd1:/var/slash-tmp/cvs-serv3179/arch/sun3x/include

Modified Files:
      Tag: mrg-vm-swap2
	vmparam.h 
Log Message:
re-merge mrg-vm-swap into -current, and call it mrg-vm-swap2.

mrg
Sun May  4 08:19:49 PDT 1997
Update of /cvsroot/src/sys/arch/sun3x/sun3x
In directory netbsd1:/var/slash-tmp/cvs-serv3179/arch/sun3x/sun3x

Modified Files:
      Tag: mrg-vm-swap2
	machdep.c 
Log Message:
re-merge mrg-vm-swap into -current, and call it mrg-vm-swap2.

mrg
Sun May  4 08:19:53 PDT 1997
Update of /cvsroot/src/sys/arch/vax/include
In directory netbsd1:/var/slash-tmp/cvs-serv3179/arch/vax/include

Modified Files:
      Tag: mrg-vm-swap2
	vmparam.h 
Log Message:
re-merge mrg-vm-swap into -current, and call it mrg-vm-swap2.

mrg
Sun May  4 08:19:56 PDT 1997
Update of /cvsroot/src/sys/arch/vax/vax
In directory netbsd1:/var/slash-tmp/cvs-serv3179/arch/vax/vax

Modified Files:
      Tag: mrg-vm-swap2
	machdep.c 
Log Message:
re-merge mrg-vm-swap into -current, and call it mrg-vm-swap2.

mrg
Sun May  4 08:19:58 PDT 1997
Update of /cvsroot/src/sys/arch/x68k/include
In directory netbsd1:/var/slash-tmp/cvs-serv3179/arch/x68k/include

Modified Files:
      Tag: mrg-vm-swap2
	vmparam.h 
Log Message:
re-merge mrg-vm-swap into -current, and call it mrg-vm-swap2.