From owner-p4-projects@FreeBSD.ORG  Fri Jun 25 20:29:40 2010
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1F4491065677; Fri, 25 Jun 2010 20:29:40 +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 D82851065670
	for <perforce@freebsd.org>; Fri, 25 Jun 2010 20:29:39 +0000 (UTC)
	(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id C55FF8FC23
	for <perforce@freebsd.org>; Fri, 25 Jun 2010 20:29:39 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o5PKTdxO061310
	for <perforce@freebsd.org>; Fri, 25 Jun 2010 20:29:39 GMT
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o5PKTdis061308
	for perforce@freebsd.org; Fri, 25 Jun 2010 20:29:39 GMT
	(envelope-from jhb@freebsd.org)
Date: Fri, 25 Jun 2010 20:29:39 GMT
Message-Id: <201006252029.o5PKTdis061308@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jhb@freebsd.org using -f
From: John Baldwin <jhb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 180223 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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, 25 Jun 2010 20:29:40 -0000

http://p4web.freebsd.org/@@180223?ac=10

Change 180223 by jhb@jhb_jhbbsd on 2010/06/25 20:29:17

	Fix merge-o.

Affected files ...

.. //depot/projects/smpng/sys/arm/include/bootinfo.h#3 edit

Differences ...

==== //depot/projects/smpng/sys/arm/include/bootinfo.h#3 (text+ko) ====

@@ -22,7 +22,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/arm/include/bootinfo.h,v 1.1 2008/10/14 10:11:14 raj Exp $
+ * $FreeBSD: src/sys/arm/include/bootinfo.h,v 1.3 2010/06/14 16:05:21 raj Exp $
  */
 
 #ifndef _MACHINE_BOOTINFO_H_