From owner-freebsd-current  Thu Nov 21 21:07:41 1996
Return-Path: owner-current
Received: (from root@localhost)
          by freefall.freebsd.org (8.7.5/8.7.3) id VAA22531
          for current-outgoing; Thu, 21 Nov 1996 21:07:41 -0800 (PST)
Received: from rocky.mt.sri.com (rocky.mt.sri.com [206.127.76.100])
          by freefall.freebsd.org (8.7.5/8.7.3) with ESMTP id VAA22496
          for <current@freebsd.org>; Thu, 21 Nov 1996 21:07:25 -0800 (PST)
Received: (from nate@localhost) by rocky.mt.sri.com (8.7.5/8.7.3) id WAA14576; Thu, 21 Nov 1996 22:07:15 -0700 (MST)
Date: Thu, 21 Nov 1996 22:07:15 -0700 (MST)
Message-Id: <199611220507.WAA14576@rocky.mt.sri.com>
From: Nate Williams <nate@mt.sri.com>
To: John Fieber <jfieber@indiana.edu>
Cc: Nate Williams <nate@mt.sri.com>, current@freebsd.org
Subject: Re: Sound-code merge in 2.2
In-Reply-To: <Pine.BSI.3.95.961121230926.6387G-100000@fallout.campusview.indiana.edu>
References: <199611220030.RAA13258@rocky.mt.sri.com>
	<Pine.BSI.3.95.961121230926.6387G-100000@fallout.campusview.indiana.edu>
Sender: owner-current@freebsd.org
X-Loop: FreeBSD.org
Precedence: bulk

> On Thu, 21 Nov 1996, Nate Williams wrote:
> 
> > I *think* I got it all merged in now, but if you have problems let me
> > know.
> 
> I see now, part of Jordan's awe commit to -current included
> file.i386 but that one piece was not brought forward to
> RELENG_2_2 while the rest of the commit was.

That as well as some changes to i386/include/soundcard.h

Both are now part of RELENG_2_2, and should have been picked up by your
cvsup update.



Nate