From owner-cvs-all@FreeBSD.ORG  Thu Oct 16 12:55:30 2003
Return-Path: <owner-cvs-all@FreeBSD.ORG>
Delivered-To: cvs-all@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id 2013616A4B3; Thu, 16 Oct 2003 12:55:30 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 9746543FCB; Thu, 16 Oct 2003 12:55:29 -0700 (PDT)
	(envelope-from sam@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h9GJtTXJ021013;
	Thu, 16 Oct 2003 12:55:29 -0700 (PDT)
	(envelope-from sam@repoman.freebsd.org)
Received: (from sam@localhost)
	by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h9GJtT3c021012;
	Thu, 16 Oct 2003 12:55:29 -0700 (PDT)
	(envelope-from sam)
Message-Id: <200310161955.h9GJtT3c021012@repoman.freebsd.org>
From: Sam Leffler <sam@FreeBSD.org>
Date: Thu, 16 Oct 2003 12:55:29 -0700 (PDT)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org,
	cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Subject: cvs commit: src/sys/netinet6 ip6_input.c
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: CVS commit messages for the entire tree <cvs-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-all>
List-Post: <mailto:cvs-all@freebsd.org>
List-Help: <mailto:cvs-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 16 Oct 2003 19:55:30 -0000

sam         2003/10/16 12:55:29 PDT

  FreeBSD src repository

  Modified files:
    sys/netinet6         ip6_input.c 
  Log:
  fix horribly botched MFp4 merge
  
  Revision  Changes    Path
  1.56      +7 -7      src/sys/netinet6/ip6_input.c