fix several botches in branch merge
authorKirk McKusick <mckusick@ucbvax.Berkeley.EDU>
Mon, 29 Nov 1982 08:28:01 +0000 (00:28 -0800)
committerKirk McKusick <mckusick@ucbvax.Berkeley.EDU>
Mon, 29 Nov 1982 08:28:01 +0000 (00:28 -0800)
commitcfc0577571115bfda1dcf7f3cf16d8192594e377
tree9659a68dc10ffc8e0018834c3fcf7ce870967f0d
parent80482eb5c074be866dde3fcc12d6c15a1f6fe467
fix several botches in branch merge

SCCS-vsn: sys/vax/uba/va.c 4.18
usr/src/sys/vax/uba/va.c