Rebase read_from_ring to be against nc2/trunk rather than defer_allocation.

diff --git a/branch-structure.txt b/branch-structure.txt
index f295fdf6184a811a199496bad00b8440f7b87d51..bb2dae4bf5342c45fe60145e71b3b6637cc3e5ba 100644 (file)
--- a/branch-structure.txt
+++ b/branch-structure.txt
@@ -21,9 +21,9 @@ defer_allocation -- Goes over the top of nc2/trunk and gets rid of a
                    transmit directly from the netdev start_xmit
                    method.
 
-read_from_ring -- Goes over the top of defer_allocation and arranges
-                 that we can read messages directly from the ring,
-                 without copying them.
+read_from_ring -- Goes over the top of nc2/trunk and arranges that we
+                 can read messages directly from the ring, without
+                 copying them.
 
 renato_patches -- A bunch of patches which Renato sent me.  Goes over
                  the top of nc2/trunk.