From owner-p4-projects@FreeBSD.ORG  Fri Oct 24 19:57:48 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 3E2591065672; Fri, 24 Oct 2008 19:57:48 +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 01CA91065670
	for <perforce@freebsd.org>; Fri, 24 Oct 2008 19:57:48 +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 E415D8FC1C
	for <perforce@freebsd.org>; Fri, 24 Oct 2008 19:57:47 +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 m9OJvlA4092298
	for <perforce@freebsd.org>; Fri, 24 Oct 2008 19:57:47 GMT
	(envelope-from marcel@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9OJvlND092296
	for perforce@freebsd.org; Fri, 24 Oct 2008 19:57:47 GMT
	(envelope-from marcel@freebsd.org)
Date: Fri, 24 Oct 2008 19:57:47 GMT
Message-Id: <200810241957.m9OJvlND092296@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 151871 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 19:57:48 -0000

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

Change 151871 by marcel@marcel_jnpr on 2008/10/24 19:57:33

	Previous merge fodder caused by me not paying attention.
	-i was needed...

Affected files ...

.. //depot/projects/powerpc/share/man/man4/man4.i386/sbni.4#3 integrate
.. //depot/projects/powerpc/sys/dev/sbni/if_sbni.c#5 integrate
.. //depot/projects/powerpc/sys/dev/sbni/if_sbni_isa.c#5 integrate
.. //depot/projects/powerpc/sys/dev/sbni/if_sbni_pci.c#5 integrate
.. //depot/projects/powerpc/sys/dev/sbni/if_sbnireg.h#4 integrate
.. //depot/projects/powerpc/sys/dev/sbni/if_sbnivar.h#4 integrate
.. //depot/projects/powerpc/sys/modules/sbni/Makefile#3 integrate

Differences ...

==== //depot/projects/powerpc/share/man/man4/man4.i386/sbni.4#3 (text+ko) ====


==== //depot/projects/powerpc/sys/dev/sbni/if_sbni.c#5 (text+ko) ====


==== //depot/projects/powerpc/sys/dev/sbni/if_sbni_isa.c#5 (text+ko) ====


==== //depot/projects/powerpc/sys/dev/sbni/if_sbni_pci.c#5 (text+ko) ====


==== //depot/projects/powerpc/sys/dev/sbni/if_sbnireg.h#4 (text+ko) ====


==== //depot/projects/powerpc/sys/dev/sbni/if_sbnivar.h#4 (text+ko) ====


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