From owner-cvs-all@FreeBSD.ORG  Sat Feb  5 08:09:03 2005
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 A066016A4CE; Sat,  5 Feb 2005 08:09:03 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 79B8043D48; Sat,  5 Feb 2005 08:09:03 +0000 (GMT)
	(envelope-from jeff@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 j15893VF000609;
	Sat, 5 Feb 2005 08:09:03 GMT
	(envelope-from jeff@repoman.freebsd.org)
Received: (from jeff@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j158930o000608;
	Sat, 5 Feb 2005 08:09:03 GMT
	(envelope-from jeff)
Message-Id: <200502050809.j158930o000608@repoman.freebsd.org>
From: Jeff Roberson <jeff@FreeBSD.org>
Date: Sat, 5 Feb 2005 08:09:03 +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 sched_4bsd.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: Sat, 05 Feb 2005 08:09:03 -0000

jeff        2005-02-05 08:09:03 UTC

  FreeBSD src repository

  Modified files:        (Branch: RELENG_5)
    sys/kern             sched_4bsd.c 
  Log:
   - Correct a bad merge job.
  
  Pointy hat to me.
  
  Revision   Changes    Path
  1.49.2.15  +2 -2      src/sys/kern/sched_4bsd.c