From owner-cvs-all  Sat Jan 29 10: 7:12 2000
Delivered-To: cvs-all@freebsd.org
Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21])
	by hub.freebsd.org (Postfix) with ESMTP
	id 93B4915A06; Sat, 29 Jan 2000 10:07:09 -0800 (PST)
	(envelope-from peter@FreeBSD.org)
Received: (from peter@localhost)
	by freefall.freebsd.org (8.9.3/8.9.2) id KAA94599;
	Sat, 29 Jan 2000 10:07:09 -0800 (PST)
	(envelope-from peter@FreeBSD.org)
Message-Id: <200001291807.KAA94599@freefall.freebsd.org>
From: Peter Wemm <peter@FreeBSD.org>
Date: Sat, 29 Jan 2000 10:07:08 -0800 (PST)
To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org
Subject: cvs commit: src/sys/i386/conf GENERIC LINT src/sys/alpha/conf
         GENERIC src/sys/pc98/conf GENERIC98
Sender: owner-cvs-all@FreeBSD.ORG
Precedence: bulk

peter       2000/01/29 10:07:08 PST

  Modified files:
    sys/i386/conf        GENERIC LINT 
    sys/alpha/conf       GENERIC 
    sys/pc98/conf        GENERIC98 
  Log:
  Remove 'conflicts' token - it has been effectively doing absolutely
  nothing for quite some time.  The only thing that cared was userconfig,
  but it was for one invisible device so we never saw it's effects.
  
  Revision  Changes    Path
  1.239     +2 -2      src/sys/i386/conf/GENERIC
  1.742     +2 -2      src/sys/i386/conf/LINT
  1.68      +2 -2      src/sys/alpha/conf/GENERIC
  1.126     +2 -2      src/sys/pc98/conf/GENERIC98



To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe cvs-all" in the body of the message