From owner-p4-projects@FreeBSD.ORG  Tue Sep 16 22:22:38 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 6A14D1065675; Tue, 16 Sep 2008 22:22:38 +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 2DBA4106566C
	for <perforce@freebsd.org>; Tue, 16 Sep 2008 22:22:38 +0000 (UTC)
	(envelope-from zec@tel.fer.hr)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 012B98FC14
	for <perforce@freebsd.org>; Tue, 16 Sep 2008 22:22:38 +0000 (UTC)
	(envelope-from zec@tel.fer.hr)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m8GMMbGU036253
	for <perforce@freebsd.org>; Tue, 16 Sep 2008 22:22:37 GMT
	(envelope-from zec@tel.fer.hr)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8GMMb5K036251
	for perforce@freebsd.org; Tue, 16 Sep 2008 22:22:37 GMT
	(envelope-from zec@tel.fer.hr)
Date: Tue, 16 Sep 2008 22:22:37 GMT
Message-Id: <200809162222.m8GMMb5K036251@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	zec@tel.fer.hr using -f
From: Marko Zec <zec@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 149915 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: Tue, 16 Sep 2008 22:22:38 -0000

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

Change 149915 by zec@zec_tpx32 on 2008/09/16 22:21:50

	more manual merging

Affected files ...

.. //depot/projects/vimage/src/sys/dev/sbni/if_sbni.c#4 add
.. //depot/projects/vimage/src/sys/dev/sbni/if_sbni_isa.c#4 add
.. //depot/projects/vimage/src/sys/dev/sbni/if_sbni_pci.c#4 add
.. //depot/projects/vimage/src/sys/dev/sbni/if_sbnireg.h#3 add
.. //depot/projects/vimage/src/sys/dev/sbni/if_sbnivar.h#3 add

Differences ...