From owner-cvs-src@FreeBSD.ORG Tue Apr 18 13:51:21 2006 Return-Path: X-Original-To: cvs-src@FreeBSD.org Delivered-To: cvs-src@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 641D916A404; Tue, 18 Apr 2006 13:51:21 +0000 (UTC) (envelope-from sobomax@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 842D843D55; Tue, 18 Apr 2006 13:51:14 +0000 (GMT) (envelope-from sobomax@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3IDpEFj025655; Tue, 18 Apr 2006 13:51:14 GMT (envelope-from sobomax@repoman.freebsd.org) Received: (from sobomax@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3IDpEx3025654; Tue, 18 Apr 2006 13:51:14 GMT (envelope-from sobomax) Message-Id: <200604181351.k3IDpEx3025654@repoman.freebsd.org> From: Maxim Sobolev Date: Tue, 18 Apr 2006 13:51:13 +0000 (UTC) To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: RELENG_6_1 Cc: Subject: cvs commit: src/sys/boot/i386/cdboot cdboot.s src/sys/boot/i386/pxeldr pxeldr.S X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 18 Apr 2006 13:51:21 -0000 sobomax 2006-04-18 13:51:13 UTC FreeBSD src repository Modified files: (Branch: RELENG_6_1) sys/boot/i386/cdboot cdboot.s sys/boot/i386/pxeldr pxeldr.S Log: MFC: Merge in timeout into A20-enable routine from cdboot/boot1. Approved by: re Reminded by: Xin LI Revision Changes Path 1.13.12.1 +10 -3 src/sys/boot/i386/cdboot/cdboot.s 1.13.12.1 +10 -3 src/sys/boot/i386/pxeldr/pxeldr.S