From owner-cvs-all  Sat Sep 30  8:58:30 2000
Delivered-To: cvs-all@freebsd.org
Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21])
	by hub.freebsd.org (Postfix) with ESMTP
	id 7762937B66E; Sat, 30 Sep 2000 08:58:28 -0700 (PDT)
Received: (from nyan@localhost)
	by freefall.freebsd.org (8.9.3/8.9.2) id IAA18188;
	Sat, 30 Sep 2000 08:58:28 -0700 (PDT)
	(envelope-from nyan@FreeBSD.org)
Message-Id: <200009301558.IAA18188@freefall.freebsd.org>
From: Takahashi Yoshihiro <nyan@FreeBSD.org>
Date: Sat, 30 Sep 2000 08:58:28 -0700 (PDT)
To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org
Subject: cvs commit: src/sys/conf options.pc98 src/sys/pc98/conf GENERIC
         src/sys/pc98/i386 machdep.c
X-FreeBSD-CVS-Branch: RELENG_4
Sender: owner-cvs-all@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.ORG

nyan        2000/09/30 08:58:28 PDT

  Modified files:        (Branch: RELENG_4)
    sys/conf             options.pc98 
    sys/pc98/conf        GENERIC 
    sys/pc98/i386        machdep.c 
  Log:
  Merged from following changes.
  
  sys/conf/options.i386	1.132.2.4
  sys/i386/conf/GENERIC	1.246.2.12
  sys/i386/i386/machdep.c	1.385.2.8
  
  Revision    Changes    Path
  1.103.2.5   +1 -3      src/sys/conf/options.pc98
  1.142.2.8   +1 -6      src/sys/pc98/conf/GENERIC
  1.151.2.10  +3 -8      src/sys/pc98/i386/machdep.c



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