From owner-cvs-all  Tue Jul 11  5:50:39 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 68B9537B583; Tue, 11 Jul 2000 05:50:34 -0700 (PDT)
	(envelope-from nyan@FreeBSD.org)
Received: (from nyan@localhost)
	by freefall.freebsd.org (8.9.3/8.9.2) id FAA39599;
	Tue, 11 Jul 2000 05:50:34 -0700 (PDT)
	(envelope-from nyan@FreeBSD.org)
Message-Id: <200007111250.FAA39599@freefall.freebsd.org>
From: Takahashi Yoshihiro <nyan@FreeBSD.org>
Date: Tue, 11 Jul 2000 05:50:34 -0700 (PDT)
To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org
Subject: cvs commit: src/sys/conf files.pc98 src/sys/pc98/pc98 fd.c
         pc98gdc.c spkr.c syscons.c syscons_pc98.c
X-FreeBSD-CVS-Branch: HEAD
Sender: owner-cvs-all@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.ORG

nyan        2000/07/11 05:50:34 PDT

  Modified files:
    sys/conf             files.pc98 
    sys/pc98/pc98        fd.c pc98gdc.c spkr.c syscons.c 
                         syscons_pc98.c 
  Log:
  Merge from the following changes.
  
  sys/conf/files.i386		1.321
  sys/dev/syscons/syscons.c	1.343
  sys/i386/isa/spkr.c		1.46
  sys/isa/fd.c			1.183 and 1.185
  sys/isa/syscons_isa.c		1.14
  sys/isa/vga_isa.c		1.18
  
  Revision  Changes    Path
  1.158     +2 -2      src/sys/conf/files.pc98
  1.92      +22 -22    src/sys/pc98/pc98/fd.c
  1.21      +23 -19    src/sys/pc98/pc98/pc98gdc.c
  1.27      +7 -6      src/sys/pc98/pc98/spkr.c
  1.148     +5 -1      src/sys/pc98/pc98/syscons.c
  1.10      +21 -18    src/sys/pc98/pc98/syscons_pc98.c



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