cgd
Thu Jun 13 13:34:56 EDT 1996
Update of /a/cvsroot/src/sys/arch/alpha/conf
In directory pain.lcs.mit.edu:/a/tmp/cvs-serv9818

Revision/Branch: netbsd-1-2

Modified Files:
	NOSY 
Log Message:
pull up from trunk (trunk commit by thorpej):
>Sync up with my local tree:
>        - add union filesystem
>        - add DEFTA device


cgd
Thu Jun 13 13:35:36 EDT 1996
Update of /a/cvsroot/src/sys/arch/alpha/conf
In directory pain.lcs.mit.edu:/a/tmp/cvs-serv9853

Revision/Branch: netbsd-1-2

Removed Files:
	GENERIC_NFS 
Log Message:
pull up from trunk (remove file):
>remove GENERIC_NFS, because:
>        (1) right now GENERIC can boot via NFS, and
>        (2) in the long run, GENERIC should autodetect network booting
>           and pick the correct root device.
>Because of (1), GENERIC_NFS is no longer _needed_ in the short term.
>Because of (2), GENERIC_NFS is not _wanted_ in the long term.


cgd
Thu Jun 13 13:38:02 EDT 1996
Update of /a/cvsroot/src/sys/arch/alpha/conf
In directory pain.lcs.mit.edu:/a/tmp/cvs-serv9898

Revision/Branch: netbsd-1-2

Modified Files:
	ALPHA 
Log Message:
pull up from trunk:
>remove "options GENERIC" since it's not needed with new setroot() code for
>GENERIC kernels, and since it no longer has any other special meaning.


cgd
Thu Jun 13 13:38:24 EDT 1996
Update of /a/cvsroot/src/sys/arch/alpha/conf
In directory pain.lcs.mit.edu:/a/tmp/cvs-serv9920

Revision/Branch: netbsd-1-2

Modified Files:
	GENERIC 
Log Message:
pull up from trunk:
>remove "options GENERIC" since it's not needed with new setroot() code for
>GENERIC kernels, and since it no longer has any other special meaning.
and:
>add example 'config' specs for 'root on sd0...' and 'root nfs...'