Module Name: src
Committed By: rin
Date: Sun Jan 27 09:19:37 UTC 2019
Modified Files:
src/sys/dev/fdt: fdt_subr.c
src/sys/rump/dev/lib/libscsipi: scsipi_component.c
src/sys/rump/dev/lib/libucom: ucom_at_usb.c
src/sys/rump/dev/lib/libulpt: ulpt_at_usb.c
src/sys/rump/dev/lib/libumass: umass_component.c
src/sys/rump/dev/lib/libwscons: wscons_component.c
src/sys/rump/kern/lib/libsys_cygwin: sys_cygwin_component.c
src/sys/rump/kern/lib/libsys_linux: linux_rump.c sys_linux_component.c
src/sys/rump/kern/lib/libsys_sunos: sys_sunos_component.c
Log Message:
Fix merge botches. I hope there's no more left...
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/sys/dev/fdt/fdt_subr.c
cvs rdiff -u -r1.4 -r1.5 src/sys/rump/dev/lib/libscsipi/scsipi_component.c
cvs rdiff -u -r1.10 -r1.11 src/sys/rump/dev/lib/libucom/ucom_at_usb.c
cvs rdiff -u -r1.8 -r1.9 src/sys/rump/dev/lib/libulpt/ulpt_at_usb.c
cvs rdiff -u -r1.4 -r1.5 src/sys/rump/dev/lib/libumass/umass_component.c
cvs rdiff -u -r1.4 -r1.5 src/sys/rump/dev/lib/libwscons/wscons_component.c
cvs rdiff -u -r1.5 -r1.6 \
src/sys/rump/kern/lib/libsys_cygwin/sys_cygwin_component.c
cvs rdiff -u -r1.4 -r1.5 src/sys/rump/kern/lib/libsys_linux/linux_rump.c
cvs rdiff -u -r1.6 -r1.7 \
src/sys/rump/kern/lib/libsys_linux/sys_linux_component.c
cvs rdiff -u -r1.5 -r1.6 \
src/sys/rump/kern/lib/libsys_sunos/sys_sunos_component.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
