From owner-cvs-all@FreeBSD.ORG  Thu Sep 28 18:27:02 2006
Return-Path: <owner-cvs-all@FreeBSD.ORG>
X-Original-To: cvs-all@FreeBSD.org
Delivered-To: cvs-all@FreeBSD.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 4D3DB16A407;
	Thu, 28 Sep 2006 18:27:02 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 04DF643D45;
	Thu, 28 Sep 2006 18:27:02 +0000 (GMT)
	(envelope-from rwatson@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8SIR1ch033066;
	Thu, 28 Sep 2006 18:27:01 GMT
	(envelope-from rwatson@repoman.freebsd.org)
Received: (from rwatson@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8SIR1lf033065;
	Thu, 28 Sep 2006 18:27:01 GMT (envelope-from rwatson)
Message-Id: <200609281827.k8SIR1lf033065@repoman.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Thu, 28 Sep 2006 18:27:01 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: RELENG_6
Cc: 
Subject: cvs commit: src/sys/sys copyright.h src/sys/kern init_main.c
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the entire tree <cvs-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-all>
List-Post: <mailto:cvs-all@freebsd.org>
List-Help: <mailto:cvs-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 28 Sep 2006 18:27:02 -0000

rwatson     2006-09-28 18:27:01 UTC

  FreeBSD src repository

  Modified files:        (Branch: RELENG_6)
    sys/sys              copyright.h 
    sys/kern             init_main.c 
  Log:
  Merge init_main.c:1.266, 1.267, copyright.h:1.22, 1.23 from HEAD to
  RELENG_6:
  
    Add "FreeBSD" trademark statement to copyright section of boot
    messages.
  
    Approved by:    core, board at FreeBSDFoundation dot org
  
  Approved by:    re (bmah)
  
  Revision   Changes    Path
  1.256.2.5  +4 -3      src/sys/kern/init_main.c
  1.19.2.2   +6 -0      src/sys/sys/copyright.h