From owner-cvs-src@FreeBSD.ORG  Fri Feb 25 17:50:31 2005
Return-Path: <owner-cvs-src@FreeBSD.ORG>
Delivered-To: cvs-src@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id ABDD016A4CE; Fri, 25 Feb 2005 17:50:31 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 7E89143D2D; Fri, 25 Feb 2005 17:50:31 +0000 (GMT)
	(envelope-from rwatson@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j1PHoVgp091912;
	Fri, 25 Feb 2005 17:50:31 GMT
	(envelope-from rwatson@repoman.freebsd.org)
Received: (from rwatson@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j1PHoVHG091911;
	Fri, 25 Feb 2005 17:50:31 GMT
	(envelope-from rwatson)
Message-Id: <200502251750.j1PHoVHG091911@repoman.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Fri, 25 Feb 2005 17:50:31 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org,
	cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: RELENG_5
Subject: cvs commit: src/sys/netatm atm_proto.c src/sys/netnatm
 natm_proto.c
X-BeenThere: cvs-src@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: CVS commit messages for the src tree <cvs-src.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src>
List-Post: <mailto:cvs-src@freebsd.org>
List-Help: <mailto:cvs-src-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 25 Feb 2005 17:50:31 -0000

rwatson     2005-02-25 17:50:31 UTC

  FreeBSD src repository

  Modified files:        (Branch: RELENG_5)
    sys/netatm           atm_proto.c 
    sys/netnatm          natm_proto.c 
  Log:
  Merge atm_proto.c:1.13 and natm_proto.c:1.15 from HEAD to RELENG_5:
  
    Mark netatm and netnatm explicitly as requiring Giant, as they still do.
  
  Revision  Changes    Path
  1.11.4.2  +2 -0      src/sys/netatm/atm_proto.c
  1.13.4.2  +2 -0      src/sys/netnatm/natm_proto.c