From owner-cvs-src@FreeBSD.ORG  Sat May 28 18:25:52 2005
Return-Path: <owner-cvs-src@FreeBSD.ORG>
X-Original-To: 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 E602616A41C;
	Sat, 28 May 2005 18:25:52 +0000 (GMT)
	(envelope-from glebius@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id AD29E43D49;
	Sat, 28 May 2005 18:25:52 +0000 (GMT)
	(envelope-from glebius@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 j4SIPqIa016318;
	Sat, 28 May 2005 18:25:52 GMT
	(envelope-from glebius@repoman.freebsd.org)
Received: (from glebius@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j4SIPqus016317;
	Sat, 28 May 2005 18:25:52 GMT (envelope-from glebius)
Message-Id: <200505281825.j4SIPqus016317@repoman.freebsd.org>
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Sat, 28 May 2005 18:25:52 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: RELENG_5
Cc: 
Subject: cvs commit: src/sys/netgraph ng_device.c
X-BeenThere: cvs-src@freebsd.org
X-Mailman-Version: 2.1.5
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: Sat, 28 May 2005 18:25:53 -0000

glebius     2005-05-28 18:25:52 UTC

  FreeBSD src repository

  Modified files:        (Branch: RELENG_5)
    sys/netgraph         ng_device.c 
  Log:
  Fix mismerge. Unbreak kernel build. Please tinderbox. Put on pointy hat.
  
  Phone call from:        maxim
  
  Revision  Changes    Path
  1.11.2.7  +2 -0      src/sys/netgraph/ng_device.c