[src/trunk]: src/doc thorpej-i2c-spi-conf -> thorpej-i2c-spi-conf2.

[thorpej <thorpej%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/888374f301a0
branches:  trunk
changeset: 1022846:888374f301a0
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Mon Aug 09 00:32:51 2021 +0000

description:
thorpej-i2c-spi-conf -> thorpej-i2c-spi-conf2.

diffstat:

 doc/BRANCHES |  16 +++++++++++++---
 1 files changed, 13 insertions(+), 3 deletions(-)

diffs (32 lines):

diff -r 1bc3bf7622e6 -r 888374f301a0 doc/BRANCHES
--- a/doc/BRANCHES      Mon Aug 09 00:30:08 2021 +0000
+++ b/doc/BRANCHES      Mon Aug 09 00:32:51 2021 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: BRANCHES,v 1.362 2021/08/07 16:21:02 thorpej Exp $
+#      $NetBSD: BRANCHES,v 1.363 2021/08/09 00:32:51 thorpej Exp $
 #
 # This file contains a list of branches that exist in the NetBSD CVS
 # tree and their current state.
@@ -777,10 +777,20 @@
 
 Branch:                thorpej-i2c-spi-conf
 Description:   Improve device tree-based I2C and SPI enumeration.
-Status:                Active
+Status:                Abandoned
 Start Date:    Sun April 25, 2021
+End Date:      Sun Aug 8, 2021
+Base Tag:      thorpej-i2c-spi-conf-base
+Maintainer:    Jason Thorpe <thorpej%netbsd.org@localhost>
+Scope:         src/sys
+Notes:         Changes ported forward to thorpej-i2c-spi-conf2.
+
+Branch:                thorpej-i2c-spi-conf2
+Description:   Improve device tree-based I2C and SPI enumeration.
+Status:                Active
+Start Date:    Sun Aug 8, 2021
 End Date:
-Base Tag:      thorpej-i2c-spi-conf-base
+Base Tag:      thorpej-i2c-spi-conf2-base
 Maintainer:    Jason Thorpe <thorpej%netbsd.org@localhost>
 Scope:         src/sys
 Notes: