From owner-freebsd-smp  Sat Mar  1 03:50:03 1997
Return-Path: <owner-smp>
Received: (from root@localhost)
          by freefall.freebsd.org (8.8.5/8.8.5) id DAA29620
          for smp-outgoing; Sat, 1 Mar 1997 03:50:03 -0800 (PST)
Received: (from peter@localhost)
          by freefall.freebsd.org (8.8.5/8.8.5) id DAA29581
          for freebsd-smp; Sat, 1 Mar 1997 03:49:59 -0800 (PST)
Date: Sat, 1 Mar 1997 03:49:59 -0800 (PST)
From: Peter Wemm <peter>
Message-Id: <199703011149.DAA29581@freefall.freebsd.org>
To: freebsd-smp
Subject: cvs commit:  sys/i386/isa clock.c icu.h icu.s if_ed.c if_ze.c isa.c isa_device.h npx.c pcibus.c random_machdep.c sio.c vector.s
Sender: owner-smp@FreeBSD.ORG
X-Loop: FreeBSD.org
Precedence: bulk

peter       97/03/01 03:49:58

  Modified:    i386/isa  clock.c icu.h icu.s if_ed.c if_ze.c isa.c
                        isa_device.h npx.c  pcibus.c random_machdep.c sio.c
                        vector.s
  Log:
  merge changes from -current for touched files
  
  Revision  Changes    Path
  1.14      +43 -15    sys/i386/isa/clock.c
  1.14      +1 -1      sys/i386/isa/icu.h
  1.22      +1 -1      sys/i386/isa/icu.s
  1.7       +12 -27    sys/i386/isa/if_ed.c
  1.10      +5 -1      sys/i386/isa/if_ze.c
  1.15      +2 -2      sys/i386/isa/isa.c
  1.8       +1 -1      sys/i386/isa/isa_device.h
  1.16      +7 -5      sys/i386/isa/npx.c
  1.7       +2 -3      sys/i386/isa/pcibus.c
  1.5       +1 -1      sys/i386/isa/random_machdep.c
  1.15      +41 -11    sys/i386/isa/sio.c
  1.38      +1 -1      sys/i386/isa/vector.s