From owner-cvs-sys  Sun Sep 14 22:00:48 1997
Return-Path: <owner-cvs-sys>
Received: (from root@localhost)
          by hub.freebsd.org (8.8.7/8.8.7) id WAA28860
          for cvs-sys-outgoing; Sun, 14 Sep 1997 22:00:48 -0700 (PDT)
Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21])
          by hub.freebsd.org (8.8.7/8.8.7) with ESMTP id WAA28804;
          Sun, 14 Sep 1997 22:00:20 -0700 (PDT)
From: "Rodney W. Grimes" <rgrimes@FreeBSD.ORG>
Received: (from rgrimes@localhost)
	by freefall.freebsd.org (8.8.6/8.8.5) id VAA20276;
	Sun, 14 Sep 1997 21:56:54 -0700 (PDT)
Date: Sun, 14 Sep 1997 21:56:54 -0700 (PDT)
Message-Id: <199709150456.VAA20276@freefall.freebsd.org>
To: cvs-committers@FreeBSD.ORG, cvs-all@FreeBSD.ORG, cvs-share@FreeBSD.ORG,
        cvs-sys@FreeBSD.ORG, cvs-usrsbin@FreeBSD.ORG
Subject: cvs commit: src/share/man/man4/man4.i386 Makefile src/sys/i386/conf
         LINT files.i386 options.i386 src/usr.sbin Makefile
         src/usr.sbin/wlconfig wlconfig.c
Sender: owner-cvs-sys@FreeBSD.ORG
X-Loop: FreeBSD.org
Precedence: bulk

rgrimes     1997/09/14 21:56:54 PDT

  Modified files:        (Branch: RELENG_2_2)
    share/man/man4/man4.i386 Makefile 
    sys/i386/conf        LINT files.i386 options.i386 
    usr.sbin             Makefile 
    usr.sbin/wlconfig    wlconfig.c 
  Log:
  Merge the wavelan driver from current into RELENG_2_2
  Reviewed by:	wavelan mailing list <wavelan@smith.net.au>
  
  Revision  Changes    Path
  1.54.2.6  +3 -2      src/share/man/man4/man4.i386/Makefile
  1.286.2.27 +5 -1      src/sys/i386/conf/LINT
  1.141.2.15 +2 -1      src/sys/i386/conf/files.i386
  1.26.2.10 +3 -1      src/sys/i386/conf/options.i386
  1.98.2.6  +3 -3      src/usr.sbin/Makefile
  1.4.2.1   +1 -4      src/usr.sbin/wlconfig/wlconfig.c