From owner-cvs-all@FreeBSD.ORG  Mon Oct  6 00:00:18 2008
Return-Path: <owner-cvs-all@FreeBSD.ORG>
Delivered-To: cvs-all@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 29D6410656C6;
	Sun,  5 Oct 2008 23:59:58 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 99C6F8FC08;
	Sun,  5 Oct 2008 23:59:58 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m95NxwZ8065130;
	Sun, 5 Oct 2008 23:59:58 GMT (envelope-from imp@repoman.freebsd.org)
Received: (from svn2cvs@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m95NxwpY065129;
	Sun, 5 Oct 2008 23:59:58 GMT (envelope-from imp@repoman.freebsd.org)
Message-Id: <200810052359.m95NxwpY065129@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: svn2cvs set sender to
	imp@repoman.freebsd.org using -f
From: Warner Losh <imp@FreeBSD.org>
Date: Sun, 5 Oct 2008 23:59:52 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Cc: 
Subject: cvs commit: src/sys/boot/arm/at91/boot2 boot2.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: Mon, 06 Oct 2008 00:00:18 -0000

imp         2008-10-05 23:59:52 UTC

  FreeBSD src repository

  Modified files:
    sys/boot/arm/at91/boot2 boot2.c 
  Log:
  SVN rev 183636 on 2008-10-05 23:59:52Z by imp
  
  Bring in the trivial differences between this code and John Hay's new
  code.  Added a copyright for the work I did to this file a couple of
  years ago.  Add John's copyright too, since I'm sure I'll be pulling
  more into this code.  This also implements a new -n option to not
  allow breaking into the boot sequence which was original in the patch
  John posted (not in the original i386 code I based this boot2.c on,
  only the name is the same).  I haven't checked to see if he did that,
  or if it was one of Sam's improvements.
  
  Submitted by:   jhay@
  
  Revision  Changes    Path
  1.11      +26 -17    src/sys/boot/arm/at91/boot2/boot2.c