From owner-p4-projects@FreeBSD.ORG Wed Apr 30 21:26:57 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E32F037B404; Wed, 30 Apr 2003 21:26:56 -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 7C93A37B401 for ; Wed, 30 Apr 2003 21:26:56 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 06A9243FAF for ; Wed, 30 Apr 2003 21:26:56 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h414Qt0U009986 for ; Wed, 30 Apr 2003 21:26:55 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h414QtmX009983 for perforce@freebsd.org; Wed, 30 Apr 2003 21:26:55 -0700 (PDT) Date: Wed, 30 Apr 2003 21:26:55 -0700 (PDT) Message-Id: <200305010426.h414QtmX009983@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 30272 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 May 2003 04:26:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=30272 Change 30272 by peter@peter_daintree on 2003/04/30 21:26:18 IFC @30271 Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/machdep.c#8 integrate .. //depot/projects/hammer/sys/dev/fb/fbreg.h#8 integrate .. //depot/projects/hammer/sys/dev/fb/vga.c#10 integrate .. //depot/projects/hammer/sys/dev/kbd/atkbdc.c#5 integrate .. //depot/projects/hammer/sys/isa/vga_isa.c#5 integrate Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/machdep.c#8 (text+ko) ==== @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)machdep.c 7.4 (Berkeley) 6/3/91 - * $FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.564 2003/05/01 01:05:21 peter Exp $ + * $FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.565 2003/05/01 04:18:02 peter Exp $ */ #include "opt_atalk.h" ==== //depot/projects/hammer/sys/dev/fb/fbreg.h#8 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING 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/dev/fb/fbreg.h,v 1.14 2003/04/29 07:06:44 marcel Exp $ + * $FreeBSD: src/sys/dev/fb/fbreg.h,v 1.15 2003/05/01 04:21:05 peter Exp $ */ #ifndef _DEV_FB_FBREG_H_ ==== //depot/projects/hammer/sys/dev/fb/vga.c#10 (text+ko) ==== @@ -26,7 +26,7 @@ * (INCLUDING 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/dev/fb/vga.c,v 1.24 2003/03/25 00:07:00 jake Exp $ + * $FreeBSD: src/sys/dev/fb/vga.c,v 1.25 2003/05/01 04:21:05 peter Exp $ */ #include "opt_vga.h" ==== //depot/projects/hammer/sys/dev/kbd/atkbdc.c#5 (text+ko) ==== @@ -27,7 +27,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/kbd/atkbdc.c,v 1.12 2002/08/19 23:58:37 peter Exp $ + * $FreeBSD: src/sys/dev/kbd/atkbdc.c,v 1.13 2003/05/01 04:19:19 peter Exp $ * from kbdio.c,v 1.13 1998/09/25 11:55:46 yokota Exp */ ==== //depot/projects/hammer/sys/isa/vga_isa.c#5 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING 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/isa/vga_isa.c,v 1.23 2003/03/25 00:07:03 jake Exp $ + * $FreeBSD: src/sys/isa/vga_isa.c,v 1.24 2003/05/01 04:23:15 peter Exp $ */ #include "opt_vga.h"