From owner-cvs-sys  Sun Jun  8 09:45:13 1997
Return-Path: <owner-cvs-sys>
Received: (from root@localhost)
          by hub.freebsd.org (8.8.5/8.8.5) id JAA22276
          for cvs-sys-outgoing; Sun, 8 Jun 1997 09:45:13 -0700 (PDT)
Received: from freefall.freebsd.org (freefall.cdrom.com [204.216.27.21])
          by hub.freebsd.org (8.8.5/8.8.5) with ESMTP id JAA22010;
          Sun, 8 Jun 1997 09:43:40 -0700 (PDT)
From: "Andrey A. Chernov" <ache@FreeBSD.ORG>
Received: (from ache@localhost)
	by freefall.freebsd.org (8.8.5/8.8.5) id JAA03986;
	Sun, 8 Jun 1997 09:43:37 -0700 (PDT)
Date: Sun, 8 Jun 1997 09:43:37 -0700 (PDT)
Message-Id: <199706081643.JAA03986@freefall.freebsd.org>
To: cvs-committers@FreeBSD.ORG, cvs-all@FreeBSD.ORG, cvs-sys@FreeBSD.ORG
Subject: cvs commit: src/sys/i386/isa isa.c
Sender: owner-cvs-sys@FreeBSD.ORG
X-Loop: FreeBSD.org
Precedence: bulk

ache        1997/06/08 09:43:37 PDT

  Modified files:
    sys/i386/isa         isa.c 
  Log:
  Make "conflicts" keyword work again
  
  Revision  Changes    Path
  1.90      +5 -4      src/sys/i386/isa/isa.c