Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. =================================================================== RCS file: /ftp/cvs/cvsroot/src/doc/BRANCHES,v rcsdiff: /ftp/cvs/cvsroot/src/doc/BRANCHES,v: warning: Unknown phrases like `commitid ...;' are present. retrieving revision 1.210 retrieving revision 1.211 diff -u -p -r1.210 -r1.211 --- src/doc/BRANCHES 2007/10/14 14:40:35 1.210 +++ src/doc/BRANCHES 2007/10/17 22:02:35 1.211 @@ -1,4 +1,4 @@ -# $NetBSD: BRANCHES,v 1.210 2007/10/14 14:40:35 yamt Exp $ +# $NetBSD: BRANCHES,v 1.211 2007/10/17 22:02:35 bouyer Exp $ # # This file contains a list of branches that exist in the NetBSD CVS # tree and their current state. @@ -254,6 +254,15 @@ Notes: This code was on a branch becaus cpuswitch.S which would otherwise make merging the nathanw_sa branch difficult. +Branch: bouyer-xenamd64 +Description: add amd64 support to Xen and rework some parts to share more code between Xen and others +Status: Active +Start Date: 18 Oct 2007 +End Date: +Base Tag: bouyer-xenamd64-base +Scope: kernel +Notes: + Branch: chris-arm-intr-rework Description: Rework arm interrupt handling code Status: Active