Module Name:	src
Committed By:	pavel
Date:		Thu Jan  4 22:10:52 UTC 2007

Modified Files:
	src/sys/arch/alpha/conf: GENERIC
Removed Files:
	src/sys/arch/alpha/conf: ALPHA

Log Message:
Merge GENERIC and ALPHA configuration, and remove the latter.  ALPHA was
supposed to be a superset of GENERIC, but sometimes it was not kept up to
date.

As proposed on port-alpha@.


To generate a diff of this commit:
cvs rdiff -r1.222 -r0 src/sys/arch/alpha/conf/ALPHA
cvs rdiff -r1.306 -r1.307 src/sys/arch/alpha/conf/GENERIC

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.