From owner-cvs-src-old@FreeBSD.ORG  Tue Sep  7 18:15:13 2010
Return-Path: <owner-cvs-src-old@FreeBSD.ORG>
Delivered-To: cvs-src-old@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 7A80D10656DA
	for <cvs-src-old@freebsd.org>; Tue,  7 Sep 2010 18:15:13 +0000 (UTC)
	(envelope-from delphij@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 664378FC23
	for <cvs-src-old@freebsd.org>; Tue,  7 Sep 2010 18:15:13 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id o87IFDPI019976
	for <cvs-src-old@freebsd.org>; Tue, 7 Sep 2010 18:15:13 GMT
	(envelope-from delphij@repoman.freebsd.org)
Received: (from svn2cvs@localhost)
	by repoman.freebsd.org (8.14.4/8.14.4/Submit) id o87IFDSP019975
	for cvs-src-old@freebsd.org; Tue, 7 Sep 2010 18:15:13 GMT
	(envelope-from delphij@repoman.freebsd.org)
Message-Id: <201009071815.o87IFDSP019975@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: svn2cvs set sender to
	delphij@repoman.freebsd.org using -f
From: Xin LI <delphij@FreeBSD.org>
Date: Tue, 7 Sep 2010 18:14:50 +0000 (UTC)
To: cvs-src-old@freebsd.org
X-FreeBSD-CVS-Branch: RELENG_7
Subject: cvs commit: src/sys/boot/i386/boot2 boot2.c
 src/sys/boot/i386/gptboot
 gptboot.c src/sys/boot/i386/loader Makefile
 src/sys/boot/i386/zfsboot zfsboot.c src/sys/boot/i386/zfsloader
 Makefile
X-BeenThere: cvs-src-old@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: **OBSOLETE** CVS commit messages for the src tree
	<cvs-src-old.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src-old>,
	<mailto:cvs-src-old-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src-old>
List-Post: <mailto:cvs-src-old@freebsd.org>
List-Help: <mailto:cvs-src-old-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src-old>,
	<mailto:cvs-src-old-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 07 Sep 2010 18:15:13 -0000

delphij     2010-09-07 18:14:50 UTC

  FreeBSD src repository

  Modified files:        (Branch: RELENG_7)
    sys/boot/i386/boot2  boot2.c 
    sys/boot/i386/gptboot gptboot.c 
    sys/boot/i386/loader Makefile 
    sys/boot/i386/zfsboot zfsboot.c 
    sys/boot/i386/zfsloader Makefile 
  Log:
  SVN rev 212300 on 2010-09-07 18:14:50Z by delphij
  
  MFC r205662 + r212066 (except efi part):
  
  Our boot loader is capable of booting both i386 and amd64 kernels so
  call it "x86" instead of "i386".
  
  Revision  Changes    Path
  1.83.2.6  +1 -1      src/sys/boot/i386/boot2/boot2.c
  1.86.2.5  +1 -1      src/sys/boot/i386/gptboot/gptboot.c
  1.85.2.9  +1 -1      src/sys/boot/i386/loader/Makefile
  1.3.2.9   +1 -1      src/sys/boot/i386/zfsboot/zfsboot.c
  1.1.4.3   +1 -1      src/sys/boot/i386/zfsloader/Makefile