From owner-p4-projects@FreeBSD.ORG  Wed Aug 20 12:22:53 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 6FCC116A4C1; Wed, 20 Aug 2003 12:22:53 -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 A4C8A16A4E2
	for <perforce@freebsd.org>; Wed, 20 Aug 2003 12:22:52 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 179C143FDF
	for <perforce@freebsd.org>; Wed, 20 Aug 2003 12:22:52 -0700 (PDT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h7KJMp0U086247
	for <perforce@freebsd.org>; Wed, 20 Aug 2003 12:22:51 -0700 (PDT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h7KJMpEc086244
	for perforce@freebsd.org; Wed, 20 Aug 2003 12:22:51 -0700 (PDT)
Date: Wed, 20 Aug 2003 12:22:51 -0700 (PDT)
Message-Id: <200308201922.h7KJMpEc086244@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 36516 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: Wed, 20 Aug 2003 19:22:54 -0000

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

Change 36516 by rwatson@rwatson_tislabs on 2003/08/20 12:22:37

	Loop-back integrate of kern_mac.c from TrustedBSD base tree
	following FreeBSD main tree commit.

Affected files ...

.. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#400 integrate

Differences ...

==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#400 (text+ko) ====

@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/kern_mac.c,v 1.94 2003/08/01 15:45:14 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/kern_mac.c,v 1.95 2003/08/20 19:16:49 rwatson Exp $");
 
 #include "opt_mac.h"
 #include "opt_devfs.h"