From owner-cvs-src@FreeBSD.ORG  Fri Sep  3 10:47:49 2004
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 B1D0E16A4CE; Fri,  3 Sep 2004 10:47:49 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 923B743D49; Fri,  3 Sep 2004 10:47:49 +0000 (GMT)
	(envelope-from julian@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i83AlnhZ029287;
	Fri, 3 Sep 2004 10:47:49 GMT
	(envelope-from julian@repoman.freebsd.org)
Received: (from julian@localhost)
	by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i83Aln0N029286;
	Fri, 3 Sep 2004 10:47:49 GMT
	(envelope-from julian)
Message-Id: <200409031047.i83Aln0N029286@repoman.freebsd.org>
From: Julian Elischer <julian@FreeBSD.org>
Date: Fri, 3 Sep 2004 10:47:49 +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/kern kern_kse.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, 03 Sep 2004 10:47:49 -0000

julian      2004-09-03 10:47:49 UTC

  FreeBSD src repository

  Modified files:        (Branch: RELENG_5)
    sys/kern             kern_kse.c 
  Log:
  fix mismerge of two MFCs
  
  Revision   Changes    Path
  1.193.2.5  +3 -3      src/sys/kern/kern_kse.c