From owner-p4-projects@FreeBSD.ORG  Mon May 17 14:28:07 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 4AA2B16A4D3; Mon, 17 May 2004 14:28:07 -0700 (PDT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 1BF2716A4D1
	for <perforce@freebsd.org>; Mon, 17 May 2004 14:28:07 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id E446443D4C
	for <perforce@freebsd.org>; Mon, 17 May 2004 14:28:05 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i4HLS5Ge074561
	for <perforce@freebsd.org>; Mon, 17 May 2004 14:28:05 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i4HLS5rS074558
	for perforce@freebsd.org; Mon, 17 May 2004 14:28:05 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Date: Mon, 17 May 2004 14:28:05 -0700 (PDT)
Message-Id: <200405172128.i4HLS5rS074558@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter@freebsd.org using -f
From: Peter Wemm <peter@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 52953 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
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: Mon, 17 May 2004 21:28:07 -0000

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

Change 52953 by peter@peter_daintree on 2004/05/17 14:27:12

	IFC @52952

Affected files ...

.. //depot/projects/hammer/sys/amd64/amd64/elf_machdep.c#26 integrate
.. //depot/projects/hammer/sys/kern/kern_linker.c#16 integrate
.. //depot/projects/hammer/sys/kern/link_elf_obj.c#36 integrate

Differences ...

==== //depot/projects/hammer/sys/amd64/amd64/elf_machdep.c#26 (text+ko) ====

@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/elf_machdep.c,v 1.20 2004/05/16 20:00:27 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/elf_machdep.c,v 1.21 2004/05/17 21:16:49 peter Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>

==== //depot/projects/hammer/sys/kern/kern_linker.c#16 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/kern_linker.c,v 1.110 2004/04/09 15:27:38 peadar Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/kern_linker.c,v 1.111 2004/05/17 21:24:39 peter Exp $");
 
 #include "opt_ddb.h"
 #include "opt_mac.h"

==== //depot/projects/hammer/sys/kern/link_elf_obj.c#36 (text+ko) ====

@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/link_elf_obj.c,v 1.78 2004/05/17 00:51:34 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/link_elf_obj.c,v 1.79 2004/05/17 21:20:23 peter Exp $");
 
 #include "opt_ddb.h"
 #include "opt_mac.h"