From owner-p4-projects@FreeBSD.ORG Sat Feb 23 18:16:35 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EEE0D16A408; Sat, 23 Feb 2008 18:16:34 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B429916A403 for ; Sat, 23 Feb 2008 18:16:34 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id AD4C313C45A for ; Sat, 23 Feb 2008 18:16:34 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1NIGYQF014018 for ; Sat, 23 Feb 2008 18:16:34 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1NIGY3r014015 for perforce@freebsd.org; Sat, 23 Feb 2008 18:16:34 GMT (envelope-from marcel@freebsd.org) Date: Sat, 23 Feb 2008 18:16:34 GMT Message-Id: <200802231816.m1NIGY3r014015@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 136022 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 23 Feb 2008 18:16:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=136022 Change 136022 by marcel@marcel_cluster on 2008/02/23 18:15:56 IFC @136020 Affected files ... .. //depot/projects/e500/sys/powerpc/include/bootinfo.h#5 integrate .. //depot/projects/e500/sys/powerpc/include/metadata.h#3 integrate Differences ... ==== //depot/projects/e500/sys/powerpc/include/bootinfo.h#5 (text+ko) ==== @@ -23,6 +23,8 @@ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (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/powerpc/include/bootinfo.h,v 1.10 2008/02/23 18:01:45 marcel Exp $ */ #ifndef _MACHINE_BOOTINFO_H_ ==== //depot/projects/e500/sys/powerpc/include/metadata.h#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/powerpc/include/metadata.h,v 1.3 2005/01/07 02:29:19 imp Exp $ + * $FreeBSD: src/sys/powerpc/include/metadata.h,v 1.4 2008/02/23 18:01:45 marcel Exp $ */ #ifndef _MACHINE_METADATA_H_