From owner-p4-projects@FreeBSD.ORG  Fri Oct 24 20:02:54 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id C6E2010656A4; Fri, 24 Oct 2008 20:02:53 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8A749106569E
	for <perforce@freebsd.org>; Fri, 24 Oct 2008 20:02:53 +0000 (UTC)
	(envelope-from marcel@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 5F5BC8FC1B
	for <perforce@freebsd.org>; Fri, 24 Oct 2008 20:02:53 +0000 (UTC)
	(envelope-from marcel@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9OK2rRm092698
	for <perforce@freebsd.org>; Fri, 24 Oct 2008 20:02:53 GMT
	(envelope-from marcel@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9OK2rN2092696
	for perforce@freebsd.org; Fri, 24 Oct 2008 20:02:53 GMT
	(envelope-from marcel@freebsd.org)
Date: Fri, 24 Oct 2008 20:02:53 GMT
Message-Id: <200810242002.m9OK2rN2092696@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	marcel@freebsd.org using -f
From: Marcel Moolenaar <marcel@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 151874 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 24 Oct 2008 20:02:54 -0000

http://perforce.freebsd.org/chv.cgi?CH=151874

Change 151874 by marcel@marcel_jnpr on 2008/10/24 20:02:47

	Even more merge fodder (...)

Affected files ...

.. //depot/projects/e500/sys/modules/sbni/Makefile#3 edit

Differences ...

==== //depot/projects/e500/sys/modules/sbni/Makefile#3 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/modules/sbni/Makefile,v 1.1 2001/11/21 22:29:35 fjoe Exp $
+# $FreeBSD: src/sys/modules/sbni/Makefile,v 1.3 2008/09/10 18:36:58 jhb Exp $
 
 .PATH: ${.CURDIR}/../../dev/sbni