From owner-cvs-all@FreeBSD.ORG  Thu Oct 19 14:47:22 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 8E1C916A403;
	Thu, 19 Oct 2006 14:47:22 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 3FE2F43D45;
	Thu, 19 Oct 2006 14:47:22 +0000 (GMT) (envelope-from jhb@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 k9JElMR1039037;
	Thu, 19 Oct 2006 14:47:22 GMT (envelope-from jhb@repoman.freebsd.org)
Received: (from jhb@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9JElM2l039036;
	Thu, 19 Oct 2006 14:47:22 GMT (envelope-from jhb)
Message-Id: <200610191447.k9JElM2l039036@repoman.freebsd.org>
From: John Baldwin <jhb@FreeBSD.org>
Date: Thu, 19 Oct 2006 14:47:22 +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/boot/common merge_help.awk
 src/sys/boot/i386/libi386
 biossmap.c src/sys/boot/i386/loader help.i386
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, 19 Oct 2006 14:47:22 -0000

jhb         2006-10-19 14:47:22 UTC

  FreeBSD src repository

  Modified files:        (Branch: RELENG_6)
    sys/boot/common      merge_help.awk 
    sys/boot/i386/libi386 biossmap.c 
    sys/boot/i386/loader help.i386 
  Log:
  MFC: Add 'smap' command on x86 and fix merge_help.awk to not choke on it.
  
  Approved by:    re (hrs)
  
  Revision  Changes    Path
  1.5.14.1  +3 -0      src/sys/boot/common/merge_help.awk
  1.3.2.2   +16 -0     src/sys/boot/i386/libi386/biossmap.c
  1.9.2.1   +7 -0      src/sys/boot/i386/loader/help.i386