From owner-freebsd-commit  Sun Jan 21 12:18:49 1996
Return-Path: owner-commit
Received: (from root@localhost)
          by freefall.freebsd.org (8.7.3/8.7.3) id MAA04556
          for freebsd-commit-outgoing; Sun, 21 Jan 1996 12:18:49 -0800 (PST)
Received: (from root@localhost)
          by freefall.freebsd.org (8.7.3/8.7.3) id MAA04547
          for cvs-all-outgoing; Sun, 21 Jan 1996 12:18:45 -0800 (PST)
Received: (from root@localhost)
          by freefall.freebsd.org (8.7.3/8.7.3) id MAA04537
          for cvs-sys-outgoing; Sun, 21 Jan 1996 12:18:43 -0800 (PST)
Received: (from jkh@localhost)
          by freefall.freebsd.org (8.7.3/8.7.3) id MAA04530
          Sun, 21 Jan 1996 12:18:41 -0800 (PST)
Date: Sun, 21 Jan 1996 12:18:41 -0800 (PST)
From: "Jordan K. Hubbard" <jkh>
Message-Id: <199601212018.MAA04530@freefall.freebsd.org>
To: CVS-committers, cvs-sys
Subject: cvs commit: src/sys/pci meteor.c
Sender: owner-commit@FreeBSD.ORG
Precedence: bulk

jkh         96/01/21 12:18:41

  Branch:      sys/i386/include  RELENG_2_1_0
               sys/pci   RELENG_2_1_0
  Modified:    sys/i386/include  ioctl_meteor.h
               sys/pci   meteor.c
  Log:
  Merge from HEAD, modulo a tweak to get it to compile under 2.1.  This code
  has also been tested under 2.1.
  
  Revision  Changes    Path
  1.1.2.1   +20 -10    src/sys/i386/include/ioctl_meteor.h
  1.3.2.1   +749 -340  src/sys/pci/meteor.c