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.196
retrieving revision 1.197
diff -u -p -r1.196 -r1.197
--- src/doc/BRANCHES	2007/05/28 09:29:18	1.196
+++ src/doc/BRANCHES	2007/07/17 19:42:40	1.197
@@ -1,4 +1,4 @@
-#	$NetBSD: BRANCHES,v 1.196 2007/05/28 09:29:18 hubertf Exp $
+#	$NetBSD: BRANCHES,v 1.197 2007/07/17 19:42:40 matt Exp $
 #
 # This file contains a list of branches that exist in the NetBSD CVS
 # tree and their current state.
@@ -322,7 +322,7 @@ Notes:		http://mail-index.netbsd.org/tec
 Branch:		matt-timespec
 Description:	Convert the kernel to struct timespec as its primary time
 		storage mechanism.
-Status:		Active
+Status:		Inactive
 Start Date:	2005-02-19
 End Date:
 Base Tag:	
@@ -330,6 +330,16 @@ Maintainer:	Matt Thomas <matt@NetBSD.org
 Scope:		kernel
 Notes:	
 
+Branch:		matt-mips64
+Description:	Rototill the mips code to support LP64 mips and N32/N64 ABIs
+Status:		Active
+Start Date:	2007-07-17
+End Date:
+Base Tag:	
+Maintainer:	Matt Thomas <matt@NetBSD.org>
+Scope:		kernel & userland
+Notes:	
+
 Branch:		newlock
 Description:	New locking primitives, based on Solaris's
 Status:		Terminated